commit 93e9df77b1e4c84cbe35c7418f0b632a94103c86
author Christoffer Adamsen <christofferqa@google.com> Wed Mar 05 15:07:04 2025 +0100
committer Christoffer Adamsen <christofferqa@google.com> Wed Mar 05 23:54:26 2025 -0800
tree 3487154120317712ee045eb4031d9016cba9a845
parent 0e40b2543f171f14c4727e9673cfbe1581bfb804

Only run R8PartialResourceUseCollector in optimized resource shrinking

Bug: b/400935182
Change-Id: Ia70b1ba77d3e0dcd27ef3faf1e1427e7ff8ee832

src/main/java/com/android/tools/r8/shaking/RootSetUtils.java

diff --git a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
index 007de8d..f7ae53e 100644
--- a/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
+++ b/src/main/java/com/android/tools/r8/shaking/RootSetUtils.java
@@ -258,15 +258,18 @@
       useCollector.run(executorService);
 
       // Trace resources.
-      R8PartialResourceUseCollector resourceUseCollector =
-          new R8PartialResourceUseCollector(appView) {
+      // TODO(b/400935182): Extend R8PartialResourceUseCollector to support LIR.
+      if (options.isOptimizedResourceShrinking()) {
+        R8PartialResourceUseCollector resourceUseCollector =
+            new R8PartialResourceUseCollector(appView) {
 
-            @Override
-            protected void keep(int resourceId) {
-              resourceRootIds.add(resourceId);
-            }
-          };
-      resourceUseCollector.run();
+              @Override
+              protected void keep(int resourceId) {
+                resourceRootIds.add(resourceId);
+              }
+            };
+        resourceUseCollector.run();
+      }
       return this;
     }