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

1 files changed, 1 insertions, 1 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));