Remove references to all Android tools from AndroidConfiguration.

Bazel unconditionally loads all the labels in configurations for now, and we don't want Android stuff to be loaded if the build doesn't have anything to do with Android. The alternative would be to fix this by not loading all configuration fragments, but this is the more expedient solution.

The SDK will be dealt with by binding //external:android/sdk to a dummy SDK unless overridden by an android_sdk_repository rule.

--
MOS_MIGRATED_REVID=97116824

5 files changed, 14 insertions, 97 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java
index 83ae86002d..1cfc058f53 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarGeneratorBuilder.java
@@ -126,7 +126,7 @@ public class AarGeneratorBuilder {
         .addOutputs(ImmutableList.<Artifact>copyOf(outs))
         .setCommandLine(CommandLine.of(args, false))
         .setExecutable(
-            ruleContext.getExecutablePrerequisite(":android_aar_generator", Mode.HOST))
+            ruleContext.getExecutablePrerequisite("$android_aar_generator", Mode.HOST))
         .setProgressMessage("Building AAR package")
         .setMnemonic("AARGenerator")
         .build(context));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index 0a5bbf1d3a..bf53b0d6a3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -572,7 +572,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
       RuleContext ruleContext, JavaSemantics javaSemantics, boolean split) {
     JavaCompilationArgs dep = ruleContext
         .getPrerequisite(
-            split ? ":incremental_split_stub_application" : ":incremental_stub_application",
+            split ? "$incremental_split_stub_application" : "$incremental_stub_application",
             Mode.TARGET)
         .getProvider(JavaCompilationArgsProvider.class)
         .getJavaCompilationArgs();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index b1d916f9d8..799409b44d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -153,26 +153,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
         throws InvalidConfigurationException {
       Options options = buildOptions.get(Options.class);
       Label sdk = RedirectChaser.followRedirects(env, options.realSdk(), "android_sdk");
-      Label incrementalStubApplication = RedirectChaser.followRedirects(env,
-          AndroidRuleClasses.DEFAULT_INCREMENTAL_STUB_APPLICATION,
-          "android_incremental_stub_application");
-      Label incrementalSplitStubApplication = RedirectChaser.followRedirects(env,
-          AndroidRuleClasses.DEFAULT_INCREMENTAL_SPLIT_STUB_APPLICATION,
-          "android_incremental_split_stub_application");
-      Label resourcesProcessor = RedirectChaser.followRedirects(env,
-          AndroidRuleClasses.DEFAULT_RESOURCES_PROCESSOR,
-          "android_resources_processor");
-      Label aarGenerator = RedirectChaser.followRedirects(env,
-          AndroidRuleClasses.DEFAULT_AAR_GENERATOR,
-          "android_aar_generator");
-
-      if (incrementalStubApplication == null) {
-        return null;
-      }
-
-      return new AndroidConfiguration(
-          options, sdk, incrementalStubApplication, incrementalSplitStubApplication,
-          resourcesProcessor, aarGenerator);
+      return new AndroidConfiguration(options, sdk);
     }
 
     @Override
@@ -187,10 +168,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
   }
 
   private final Label sdk;
-  private final Label incrementalStubApplication;
-  private final Label incrementalSplitStubApplication;
-  private final Label resourcesProcessor;
-  private final Label aarGenerator;
   private final StrictDepsMode strictDeps;
   private final boolean legacyNativeSupport;
   private final String cpu;
@@ -199,13 +176,8 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
   private final boolean useJackForDexing;
   private final boolean jackSanityChecks;
 
-  AndroidConfiguration(Options options, Label sdk, Label incrementalStubApplication,
-      Label incrementalSplitStubApplication, Label resourcesProcessor, Label aarGenerator) {
+  AndroidConfiguration(Options options, Label sdk) {
     this.sdk = sdk;
-    this.incrementalStubApplication = incrementalStubApplication;
-    this.incrementalSplitStubApplication = incrementalSplitStubApplication;
-    this.resourcesProcessor = resourcesProcessor;
-    this.aarGenerator = aarGenerator;
     this.strictDeps = options.strictDeps;
     this.legacyNativeSupport = options.legacyNativeSupport;
     this.cpu = options.cpu;
@@ -231,22 +203,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     return strictDeps;
   }
 
-  public Label getIncrementalStubApplication() {
-    return incrementalStubApplication;
-  }
-
-  public Label getIncrementalSplitStubApplication() {
-    return incrementalSplitStubApplication;
-  }
-
-  public Label getResourcesProcessor() {
-    return resourcesProcessor;
-  }
-
-  public Label getAarGenerator() {
-    return aarGenerator;
-  }
-
   public boolean isFatApk() {
     return fatApk;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java
index fd859e01f0..e313a877a4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java
@@ -182,7 +182,7 @@ public class AndroidResourcesProcessorBuilder {
     args.add(sdk.getAapt().getExecutable().getExecPathString());
 
     Iterables.addAll(ins,
-        ruleContext.getExecutablePrerequisite(":android_resources_processor", Mode.HOST)
+        ruleContext.getExecutablePrerequisite("$android_resources_processor", Mode.HOST)
             .getRunfilesSupport()
             .getRunfilesArtifactsWithoutMiddlemen());
 
@@ -289,7 +289,7 @@ public class AndroidResourcesProcessorBuilder {
         .addOutputs(ImmutableList.<Artifact>copyOf(outs))
         .addArguments(ImmutableList.<String>copyOf(args))
         .setExecutable(
-            ruleContext.getExecutablePrerequisite(":android_resources_processor", Mode.HOST))
+            ruleContext.getExecutablePrerequisite("$android_resources_processor", Mode.HOST))
         .setProgressMessage("Processing resources")
         .setMnemonic("AndroidAapt")
         .build(context));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index abeaec49c4..d14b307fed 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -144,45 +144,6 @@ public final class AndroidRuleClasses {
   public static final Label DEFAULT_AAR_GENERATOR =
       Label.parseAbsoluteUnchecked(Constants.ANDROID_DEP_PREFIX + "aar_generator");
 
-  public static final LateBoundLabel<BuildConfiguration> INCREMENTAL_STUB_APPLICATION =
-      new LateBoundLabel<BuildConfiguration>(DEFAULT_INCREMENTAL_STUB_APPLICATION) {
-        @Override
-        public Label getDefault(Rule rule, BuildConfiguration configuration) {
-          return
-              configuration.getFragment(AndroidConfiguration.class).getIncrementalStubApplication();
-        }
-      };
-
-  static final LateBoundLabel<BuildConfiguration> INCREMENTAL_SPLIT_STUB_APPLICATION =
-      new LateBoundLabel<BuildConfiguration>(DEFAULT_INCREMENTAL_SPLIT_STUB_APPLICATION) {
-        @Override
-        public Label getDefault(Rule rule, BuildConfiguration configuration) {
-          return configuration
-              .getFragment(AndroidConfiguration.class)
-              .getIncrementalSplitStubApplication();
-        }
-      };
-
-  public static final LateBoundLabel<BuildConfiguration> RESOURCES_PROCESSOR =
-      new LateBoundLabel<BuildConfiguration>(DEFAULT_RESOURCES_PROCESSOR) {
-        @Override
-        public Label getDefault(Rule rule, BuildConfiguration configuration) {
-          return configuration
-              .getFragment(AndroidConfiguration.class)
-              .getResourcesProcessor();
-        }
-      };
-
-  public static final LateBoundLabel<BuildConfiguration> AAR_GENERATOR =
-      new LateBoundLabel<BuildConfiguration>(DEFAULT_AAR_GENERATOR) {
-        @Override
-        public Label getDefault(Rule rule, BuildConfiguration configuration) {
-          return configuration
-              .getFragment(AndroidConfiguration.class)
-              .getAarGenerator();
-        }
-      };
-
   /**
    * Implementation for the :proguard attribute.
    */
@@ -380,10 +341,10 @@ public final class AndroidRuleClasses {
     @Override
     public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) {
       return builder
-          .add(attr(":android_resources_processor", LABEL).cfg(HOST).exec().value(
-              AndroidRuleClasses.RESOURCES_PROCESSOR))
-          .add(attr(":android_aar_generator", LABEL).cfg(HOST).exec().value(
-              AndroidRuleClasses.AAR_GENERATOR))
+          .add(attr("$android_resources_processor", LABEL).cfg(HOST).exec().value(
+              AndroidRuleClasses.DEFAULT_RESOURCES_PROCESSOR))
+          .add(attr("$android_aar_generator", LABEL).cfg(HOST).exec().value(
+              AndroidRuleClasses.DEFAULT_AAR_GENERATOR))
           .build();
     }
 
@@ -624,10 +585,10 @@ public final class AndroidRuleClasses {
               .value(env.getLabel(BUILD_SPLIT_MANIFEST_LABEL)))
           .add(attr("$strip_resources", LABEL).cfg(HOST).exec()
               .value(env.getLabel(AndroidRuleClasses.STRIP_RESOURCES_LABEL)))
-          .add(attr(":incremental_stub_application", LABEL)
-              .value(AndroidRuleClasses.INCREMENTAL_STUB_APPLICATION))
-          .add(attr(":incremental_split_stub_application", LABEL)
-              .value(AndroidRuleClasses.INCREMENTAL_SPLIT_STUB_APPLICATION))
+          .add(attr("$incremental_stub_application", LABEL)
+              .value(DEFAULT_INCREMENTAL_STUB_APPLICATION))
+          .add(attr("$incremental_split_stub_application", LABEL)
+              .value(DEFAULT_INCREMENTAL_SPLIT_STUB_APPLICATION))
           /* <!-- #BLAZE_RULE($android_binary_base).ATTRIBUTE(dexopts) -->
           Additional command-line flags for the dx tool when generating classes.dex.
           ${SYNOPSIS}