Adds ResourceShrinkerAction to android_binary targets if they use Proguard and specify --experimental_android_resource_shrinking on the command line.

RELNOTES: Specifying --experimental_android_resource_shrinking on the command line will enable a resource shrinking pass on android_binary targets that already use Proguard.

--
MOS_MIGRATED_REVID=116572863

1 files changed, 14 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
index 8b3927459b..189c3fd793 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java
@@ -81,6 +81,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
       resourceApk = applicationManifest.packWithDataAndResources(
           ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_APK),
           ruleContext,
+          true, /* isLibrary */
           ResourceDependencies.fromRuleDeps(ruleContext, JavaCommon.isNeverLink(ruleContext)),
           ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_R_TXT),
           ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_SYMBOLS_TXT),
@@ -92,8 +93,8 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
           null /* versionName */,
           false,
           null /* proguardCfgOut */,
-          ruleContext.getImplicitOutputArtifact(
-                  AndroidRuleClasses.ANDROID_LIBRARY_MANIFEST));
+          ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_LIBRARY_MANIFEST),
+          null /* mergedResourcesOut */);
       if (ruleContext.hasErrors()) {
         return null;
       }
@@ -150,18 +151,17 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
           ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_R_TXT), null);
 
       primaryResources = new AndroidResourcesProcessorBuilder(ruleContext)
-              .setApkOut(apk)
-              .setRTxtOut(resourceContainer.getRTxt())
-              .setManifestOut(
-                  ruleContext.getImplicitOutputArtifact(
-                      AndroidRuleClasses.ANDROID_LIBRARY_MANIFEST))
-              .setSourceJarOut(resourceContainer.getJavaSourceJar())
-              .setJavaPackage(resourceContainer.getJavaPackage())
-              .withPrimary(resourceContainer)
-              .withDependencies(resourceApk.getResourceDependencies())
-              .setDebug(
-                  ruleContext.getConfiguration().getCompilationMode() != CompilationMode.OPT)
-              .build(ruleContext);
+          .setLibrary(true)
+          .setApkOut(apk)
+          .setRTxtOut(resourceContainer.getRTxt())
+          .setManifestOut(ruleContext.getImplicitOutputArtifact(
+              AndroidRuleClasses.ANDROID_LIBRARY_MANIFEST))
+          .setSourceJarOut(resourceContainer.getJavaSourceJar())
+          .setJavaPackage(resourceContainer.getJavaPackage())
+          .withPrimary(resourceContainer)
+          .withDependencies(resourceApk.getResourceDependencies())
+          .setDebug(ruleContext.getConfiguration().getCompilationMode() != CompilationMode.OPT)
+          .build(ruleContext);
     }
 
     new AarGeneratorBuilder(ruleContext)