commit 563775b531afd77d7834614b52829ac5abd4bebf
author Rico Wind <ricow@google.com> Thu Sep 19 14:58:31 2024 +0200
committer Rico Wind <ricow@google.com> Fri Sep 20 04:20:51 2024 +0000
tree 1b0c29a83ab4dc9ce91254f8894c34ed6d0991c6
parent 82f0acdbea43bd283d601b01f343c1c7dd35df2b

Don't instantiate legacy structure in optimized resource shrinking mode

Bug: 287398085
Change-Id: I907971d9e76db9d116f8b9995b34d344ddc7f964

src/main/java/com/android/tools/r8/R8.java

diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index b4f89a3..05daa4d 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -946,34 +946,35 @@
 
   private void shrinkResources(
       Map<String, byte[]> dexFileContent, AppView<AppInfoWithClassHierarchy> appView) {
-    LegacyResourceShrinker.Builder resourceShrinkerBuilder = LegacyResourceShrinker.builder();
     Reporter reporter = options.reporter;
-    dexFileContent.forEach(resourceShrinkerBuilder::addDexInput);
     try {
-      addResourcesToBuilder(
-          resourceShrinkerBuilder, reporter, options.androidResourceProvider, FeatureSplit.BASE);
-      if (options.featureSplitConfiguration != null) {
-        for (FeatureSplit featureSplit : options.featureSplitConfiguration.getFeatureSplits()) {
-          if (featureSplit.getAndroidResourceProvider() != null) {
-            addResourcesToBuilder(
-                resourceShrinkerBuilder,
-                reporter,
-                featureSplit.getAndroidResourceProvider(),
-                featureSplit);
-          }
-        }
-      }
-      if (options.androidResourceProguardMapStrings != null) {
-        resourceShrinkerBuilder.setProguardMapStrings(options.androidResourceProguardMapStrings);
-      }
-      resourceShrinkerBuilder.setShrinkerDebugReporter(
-          ResourceShrinkerUtils.shrinkerDebugReporterFromStringConsumer(
-              options.resourceShrinkerConfiguration.getDebugConsumer(), reporter));
-      LegacyResourceShrinker shrinker = resourceShrinkerBuilder.build();
       ShrinkerResult shrinkerResult;
-      if (options.resourceShrinkerConfiguration.isOptimizedShrinking()) {
+
+      if (appView.options().isOptimizedResourceShrinking()) {
         shrinkerResult = appView.getResourceShrinkerState().shrinkModel();
       } else {
+        LegacyResourceShrinker.Builder resourceShrinkerBuilder = LegacyResourceShrinker.builder();
+        dexFileContent.forEach(resourceShrinkerBuilder::addDexInput);
+        addResourcesToBuilder(
+            resourceShrinkerBuilder, reporter, options.androidResourceProvider, FeatureSplit.BASE);
+        if (options.featureSplitConfiguration != null) {
+          for (FeatureSplit featureSplit : options.featureSplitConfiguration.getFeatureSplits()) {
+            if (featureSplit.getAndroidResourceProvider() != null) {
+              addResourcesToBuilder(
+                  resourceShrinkerBuilder,
+                  reporter,
+                  featureSplit.getAndroidResourceProvider(),
+                  featureSplit);
+            }
+          }
+        }
+        if (options.androidResourceProguardMapStrings != null) {
+          resourceShrinkerBuilder.setProguardMapStrings(options.androidResourceProguardMapStrings);
+        }
+        resourceShrinkerBuilder.setShrinkerDebugReporter(
+            ResourceShrinkerUtils.shrinkerDebugReporterFromStringConsumer(
+                options.resourceShrinkerConfiguration.getDebugConsumer(), reporter));
+        LegacyResourceShrinker shrinker = resourceShrinkerBuilder.build();
         shrinkerResult = shrinker.run();
       }
       Set<String> toKeep = shrinkerResult.getResFolderEntriesToKeep();