Avoid generating an ap_ file for android_library

Saves roughly 200ms per aapt invocation, when aapt is only used
for validation of resources.

--
MOS_MIGRATED_REVID=121863470

1 files changed, 3 insertions, 6 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 eae49fb328..e3fe0b4256 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,7 +81,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
         return null;
       }
       resourceApk = applicationManifest.packWithDataAndResources(
-          ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_APK),
+          null, /* resourceApk -- not needed for library */
           ruleContext,
           true, /* isLibrary */
           ResourceDependencies.fromRuleDeps(ruleContext, JavaCommon.isNeverLink(ruleContext)),
@@ -148,14 +148,12 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
       aar = null;
       ApplicationManifest applicationManifest = ApplicationManifest.generatedManifest(ruleContext);
 
-      Artifact apk = ruleContext.getImplicitOutputArtifact(
-          AndroidRuleClasses.ANDROID_RESOURCES_APK);
-
       String javaPackage = AndroidCommon.getJavaPackage(ruleContext);
 
       ResourceContainer resourceContainer = new ResourceContainer(ruleContext.getLabel(),
           javaPackage, null /* renameManifestPackage */, false /* inlinedConstants */,
-          apk, applicationManifest.getManifest(),
+          null /* resourceApk -- not needed for library */,
+          applicationManifest.getManifest(),
           ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_JAVA_SOURCE_JAR),
           ImmutableList.<Artifact>of(), ImmutableList.<Artifact>of(),
           ImmutableList.<PathFragment>of(), ImmutableList.<PathFragment>of(),
@@ -164,7 +162,6 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory {
 
       primaryResources = new AndroidResourcesProcessorBuilder(ruleContext)
           .setLibrary(true)
-          .setApkOut(apk)
           .setRTxtOut(resourceContainer.getRTxt())
           .setManifestOut(ruleContext.getImplicitOutputArtifact(
               AndroidRuleClasses.ANDROID_PROCESSED_MANIFEST))