commit 8c34d5d7c33460365b17bb3bbb6c7ee5ad62f093
author Christoffer Adamsen <christofferqa@google.com> Thu May 15 11:19:02 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Thu May 15 04:28:10 2025 -0700
tree 08beb8da7d1e3100f761a1f7d300ec996cdf88c6
parent e4db408c5c74e646b9aac243984fe3c5cde6af54

Implicitly enable optimized resource shrinking in partial

Fixes: b/417923265
Change-Id: I69710e7e62070d80cddf83288204bf2aba0686fc

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

diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index 38ed5ab..0afb85b 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -786,7 +786,9 @@
       }
       if (androidResourceProvider != null
           && !resourceShrinkerConfiguration.isOptimizedShrinking()) {
-        reporter.error("Partial shrinking only supports optimized resource shrinking");
+        reporter.warning(
+            "Partial shrinking only supports optimized resource shrinking. "
+                + "Optimized resource shrinking will be enabled implicitly.");
       }
     }
 

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 21e75da..01bc03f 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -233,7 +233,11 @@
   }
 
   public boolean isOptimizedResourceShrinking() {
-    return androidResourceProvider != null && resourceShrinkerConfiguration.isOptimizedShrinking();
+    if (androidResourceProvider == null) {
+      return false;
+    }
+    return resourceShrinkerConfiguration.isOptimizedShrinking()
+        || partialSubCompilationConfiguration != null;
   }
 
   public ProguardConfiguration getProguardConfiguration() {