Eliminate the Android tools repository, and with it, Constants.ANDROID_DEP_PREFIX.

This regrettably entails adding the options parser to the embedded tools in the Bazel binary, but that's only a temporary measure until the embedded binaries are compiled (and not provided in source from)

--
MOS_MIGRATED_REVID=106379028

11 files changed, 16 insertions, 346 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/Constants.java b/src/main/java/com/google/devtools/build/lib/Constants.java
index a5036b3d54..144abeaca5 100644
--- a/src/main/java/com/google/devtools/build/lib/Constants.java
+++ b/src/main/java/com/google/devtools/build/lib/Constants.java
@@ -37,7 +37,6 @@ public class Constants {
   public static final String ANDROID_DEFAULT_CROSSTOOL = "//external:android/crosstool".toString();
   public static final ImmutableList<String> ANDROID_DEFAULT_FAT_APK_CPUS =
       ImmutableList.<String>of("armeabi-v7a");
-  public static final String ANDROID_DEP_PREFIX = "//external:android/".toString();
   public static final String TOOLS_REPOSITORY = "@bazel_tools".toString();
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
index 552419ae4b..a5075f42a4 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
@@ -44,12 +44,8 @@ import com.google.devtools.build.lib.bazel.repository.RepositoryDelegatorFunctio
 import com.google.devtools.build.lib.bazel.repository.RepositoryFunction;
 import com.google.devtools.build.lib.bazel.repository.TarGzFunction;
 import com.google.devtools.build.lib.bazel.repository.ZipFunction;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidHttpToolsRepositoryFunction;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidLocalToolsRepositoryFunction;
 import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryFunction;
 import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryRule;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidRepositoryRules;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidRepositoryRules.AndroidHttpToolsRepositoryRule;
 import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryFunction;
 import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRule;
 import com.google.devtools.build.lib.bazel.rules.workspace.GitRepositoryRule;
@@ -111,10 +107,6 @@ public class BazelRepositoryModule extends BlazeModule {
             .put(NewLocalRepositoryRule.NAME, new NewLocalRepositoryFunction())
             .put(AndroidSdkRepositoryRule.NAME, new AndroidSdkRepositoryFunction())
             .put(AndroidNdkRepositoryRule.NAME, new AndroidNdkRepositoryFunction())
-            .put(
-                AndroidRepositoryRules.AndroidLocalRepositoryRule.NAME,
-                new AndroidLocalToolsRepositoryFunction())
-            .put(AndroidHttpToolsRepositoryRule.NAME, new AndroidHttpToolsRepositoryFunction())
             .build();
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
index 38fb0bb026..2e7f654655 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -30,8 +30,6 @@ import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
 import com.google.devtools.build.lib.analysis.constraints.EnvironmentRule;
 import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryRule;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidRepositoryRules;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidRepositoryRules.AndroidHttpToolsRepositoryRule;
 import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRule;
 import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidBinaryRule;
 import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidLibraryRule;
@@ -365,8 +363,6 @@ public class BazelRuleClassProvider {
     builder.addRuleDefinition(new NewLocalRepositoryRule());
     builder.addRuleDefinition(new AndroidSdkRepositoryRule());
     builder.addRuleDefinition(new AndroidNdkRepositoryRule());
-    builder.addRuleDefinition(new AndroidRepositoryRules.AndroidLocalRepositoryRule());
-    builder.addRuleDefinition(new AndroidHttpToolsRepositoryRule());
 
     builder.addAspectFactory(AndroidStudioInfoAspect.NAME, AndroidStudioInfoAspect.class);
 
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidHttpToolsRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidHttpToolsRepositoryFunction.java
deleted file mode 100644
index c1c640c357..0000000000
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidHttpToolsRepositoryFunction.java
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2015 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.bazel.rules.android;
-
-import com.google.devtools.build.lib.analysis.RuleDefinition;
-import com.google.devtools.build.lib.bazel.repository.DecompressorDescriptor;
-import com.google.devtools.build.lib.bazel.repository.DecompressorValue;
-import com.google.devtools.build.lib.bazel.repository.HttpDownloadFunction;
-import com.google.devtools.build.lib.bazel.repository.HttpDownloadValue;
-import com.google.devtools.build.lib.bazel.repository.RepositoryFunction;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidRepositoryRules.AndroidHttpToolsRepositoryRule;
-import com.google.devtools.build.lib.cmdline.PackageIdentifier.RepositoryName;
-import com.google.devtools.build.lib.packages.Rule;
-import com.google.devtools.build.lib.skyframe.FileValue;
-import com.google.devtools.build.lib.skyframe.RepositoryValue;
-import com.google.devtools.build.lib.vfs.FileSystemUtils;
-import com.google.devtools.build.lib.vfs.Path;
-import com.google.devtools.build.skyframe.SkyFunctionException;
-import com.google.devtools.build.skyframe.SkyFunctionException.Transience;
-import com.google.devtools.build.skyframe.SkyFunctionName;
-import com.google.devtools.build.skyframe.SkyKey;
-import com.google.devtools.build.skyframe.SkyValue;
-
-import java.io.IOException;
-
-/**
- * Implementation of the {@code android_http_tools_repository} workspace rule.
- */
-public class AndroidHttpToolsRepositoryFunction extends RepositoryFunction {
-
-  @Override
-  public SkyFunctionName getSkyFunctionName() {
-    return SkyFunctionName.create(
-        AndroidHttpToolsRepositoryRule.NAME.toUpperCase());
-  }
-
-  @Override
-  public Class<? extends RuleDefinition> getRuleDefinition() {
-    return AndroidHttpToolsRepositoryRule.class;
-  }
-
-  @Override
-  public SkyValue compute(SkyKey skyKey, Environment env) throws SkyFunctionException {
-    RepositoryName repositoryName = (RepositoryName) skyKey.argument();
-    Rule rule = RepositoryFunction.getRule(
-        repositoryName, AndroidHttpToolsRepositoryRule.NAME, env);
-    if (rule == null) {
-      return null;
-    }
-
-    Path outputDirectory = getExternalRepositoryDirectory().getRelative(rule.getName());
-    try {
-      FileSystemUtils.createDirectoryAndParents(outputDirectory);
-    } catch (IOException e1) {
-      throw new RepositoryFunctionException(e1, Transience.TRANSIENT);
-    }
-    FileValue directoryValue = getRepositoryDirectory(outputDirectory, env);
-    if (directoryValue == null) {
-      return null;
-    }
-
-    try {
-      HttpDownloadValue downloadValue = (HttpDownloadValue) env.getValueOrThrow(
-          HttpDownloadFunction.key(rule, outputDirectory), IOException.class);
-      if (downloadValue == null) {
-        return null;
-      }
-
-      DecompressorValue value = (DecompressorValue) env.getValueOrThrow(
-          DecompressorValue.key(DecompressorDescriptor.builder()
-              .setTargetKind(rule.getTargetKind())
-              .setTargetName(rule.getName())
-              .setArchivePath(downloadValue.getPath())
-              .setRepositoryPath(outputDirectory)
-              .build()),
-          IOException.class);
-      if (value == null) {
-        return null;
-      }
-    } catch (IOException e) {
-      // Assumes all IO errors transient.
-      throw new RepositoryFunctionException(e, Transience.TRANSIENT);
-    }
-    return RepositoryValue.create(directoryValue);
-  }
-}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidLocalToolsRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidLocalToolsRepositoryFunction.java
deleted file mode 100644
index c5d14305e7..0000000000
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidLocalToolsRepositoryFunction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package com.google.devtools.build.lib.bazel.rules.android;
-
-import com.google.devtools.build.lib.analysis.RuleDefinition;
-import com.google.devtools.build.lib.bazel.repository.RepositoryFunction;
-import com.google.devtools.build.lib.cmdline.PackageIdentifier.RepositoryName;
-import com.google.devtools.build.lib.packages.Rule;
-import com.google.devtools.build.lib.skyframe.FileValue;
-import com.google.devtools.build.lib.skyframe.RepositoryValue;
-import com.google.devtools.build.lib.vfs.PathFragment;
-import com.google.devtools.build.skyframe.SkyFunctionException;
-import com.google.devtools.build.skyframe.SkyFunctionName;
-import com.google.devtools.build.skyframe.SkyKey;
-import com.google.devtools.build.skyframe.SkyValue;
-
-/**
- * Implementation of the {@code android_local_tools_repository} rule.
- */
-public class AndroidLocalToolsRepositoryFunction extends RepositoryFunction {
-  @Override
-  public SkyValue compute(SkyKey skyKey, Environment env) throws SkyFunctionException {
-    RepositoryName repositoryName = (RepositoryName) skyKey.argument();
-    Rule rule = getRule(
-        repositoryName, AndroidRepositoryRules.AndroidLocalRepositoryRule.NAME, env);
-    if (rule == null) {
-      return null;
-    }
-
-    FileValue directoryValue = prepareLocalRepositorySymlinkTree(rule, env);
-    if (directoryValue == null) {
-      return null;
-    }
-
-    PathFragment pathFragment = getTargetPath(rule);
-
-    if (!symlinkLocalRepositoryContents(
-        directoryValue.realRootedPath().asPath(),
-        getOutputBase().getFileSystem().getPath(pathFragment),
-        env)) {
-      return null;
-    }
-
-    return RepositoryValue.create(directoryValue);
-  }
-
-  @Override
-  public SkyFunctionName getSkyFunctionName() {
-    return SkyFunctionName.create(
-        AndroidRepositoryRules.AndroidLocalRepositoryRule.NAME.toUpperCase());
-  }
-
-  @Override
-  public Class<? extends RuleDefinition> getRuleDefinition() {
-    return AndroidRepositoryRules.AndroidLocalRepositoryRule.class;
-  }
-}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidRepositoryRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidRepositoryRules.java
deleted file mode 100644
index 582a5b14eb..0000000000
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidRepositoryRules.java
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2015 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package com.google.devtools.build.lib.bazel.rules.android;
-
-import static com.google.devtools.build.lib.packages.Attribute.attr;
-import static com.google.devtools.build.lib.syntax.Type.STRING;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.devtools.build.lib.analysis.RuleDefinition;
-import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
-import com.google.devtools.build.lib.bazel.rules.workspace.WorkspaceBaseRule;
-import com.google.devtools.build.lib.bazel.rules.workspace.WorkspaceConfiguredTargetFactory;
-import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.Rule;
-import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.RuleClass.Builder;
-import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
-
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-/**
- * Definitions for the Android repository WORKSPACE rules.
- */
-public class AndroidRepositoryRules {
-    private static final ImmutableList<String> TOOLS = ImmutableList.of(
-        "proguard_whitelister",
-        "merge_manifests",
-        "build_incremental_dexmanifest",
-        "stubify_manifest",
-        "incremental_install",
-        "build_split_manifest",
-        "strip_resources",
-        "incremental_stub_application",
-        "incremental_split_stub_application",
-        "resources_processor",
-        "aar_generator",
-        "shuffle_jars",
-        "merge_dexzips",
-        "debug_keystore",
-        "IdlClass");
-
-    private static final Function<? super Rule, Map<String, Label>> BINDINGS_FUNCTION =
-        new Function< Rule, Map<String, Label>>() {
-          @Nullable
-          @Override
-          public Map<String, Label> apply(Rule rule) {
-            ImmutableMap.Builder<String, Label> result = ImmutableMap.builder();
-            for (String tool : TOOLS) {
-              result.put("android/" + tool, Label.parseAbsoluteUnchecked(
-                  "@" + rule.getName() + "//tools/android:" + tool));
-            }
-
-            return result.build();
-          }
-        };
-
-  /**
-   * Definition of the {@code android_local_tools_repository} rule.
-   */
-  public static class AndroidLocalRepositoryRule implements RuleDefinition {
-    public static final String NAME = "android_local_tools_repository";
-
-    @Override
-    public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) {
-      return builder
-          .setUndocumented()
-          .setWorkspaceOnly()
-          .setExternalBindingsFunction(BINDINGS_FUNCTION)
-          .add(attr("path", STRING).mandatory().nonconfigurable("WORKSPACE rule"))
-          .build();
-
-    }
-
-    @Override
-    public Metadata getMetadata() {
-      return RuleDefinition.Metadata.builder()
-          .name(AndroidLocalRepositoryRule.NAME)
-          .type(RuleClassType.WORKSPACE)
-          .ancestors(WorkspaceBaseRule.class)
-          .factoryClass(WorkspaceConfiguredTargetFactory.class)
-          .build();
-
-    }
-  }
-
-  /**
-   * Definition of the {@code android_http_tools_repository} rule.
-   */
-  public static class AndroidHttpToolsRepositoryRule implements RuleDefinition {
-    public static final String NAME = "android_http_tools_repository";
-
-    @Override
-    public RuleClass build(Builder builder, RuleDefinitionEnvironment environment) {
-      return builder
-          .setUndocumented()
-          .setWorkspaceOnly()
-          .setExternalBindingsFunction(BINDINGS_FUNCTION)
-          .add(attr("url", STRING).mandatory())
-          .add(attr("sha256", STRING).mandatory())
-          .build();
-
-    }
-
-    @Override
-    public Metadata getMetadata() {
-      return RuleDefinition.Metadata.builder()
-          .name(AndroidHttpToolsRepositoryRule.NAME)
-          .type(RuleClassType.WORKSPACE)
-          .ancestors(WorkspaceBaseRule.class)
-          .factoryClass(WorkspaceConfiguredTargetFactory.class)
-          .build();
-
-    }
-  }
-
-  /**
-   * List of tools for {@link com.google.devtools.build.lib.analysis.mock.BazelAnalysisMock}.
-   */
-  @VisibleForTesting
-  public static ImmutableList<String> toolsForTesting() {
-    return TOOLS;
-  }
-
-}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java
index 83906536ea..8c925d0f3e 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidBinaryRule.java
@@ -43,7 +43,8 @@ public class BazelAndroidBinaryRule implements RuleDefinition {
         .add(attr("$debug_keystore", BuildType.LABEL)
             .cfg(HOST)
             .singleArtifact()
-            .value(environment.getLabel(Constants.ANDROID_DEP_PREFIX + "debug_keystore")))
+            .value(environment.getLabel(
+                Constants.TOOLS_REPOSITORY + "//tools/android:debug_keystore")))
         .add(attr(":cc_toolchain_split", BuildType.LABEL)
             .cfg(AndroidRuleClasses.ANDROID_SPLIT_TRANSITION)
             .value(BazelCppRuleClasses.CC_TOOLCHAIN))
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE
index fcd20700c3..711409aaa6 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE
@@ -1,5 +1,3 @@
-android_local_tools_repository(name = "default_android_tools", path = __embedded_dir__ + "/embedded_tools")
-
 # bind(name = "android/proguard_whitelister", actual = "//tools/android:proguard_whitelister")
 # bind(name = "android/merge_manifests", actual = "//tools/android:merge_manifests")
 # bind(name = "android/build_incremental_dexmanifest", actual = "//tools/android:build_incremental_dexmanifest")
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 6b3d79b857..3daf4fee37 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
@@ -119,31 +119,32 @@ public final class AndroidRuleClasses {
   public static final SafeImplicitOutputsFunction JAVA_RESOURCES_JAR =
       fromTemplates("%{name}_files/java_resources.jar");
   public static final String MANIFEST_MERGE_TOOL_LABEL =
-      Constants.ANDROID_DEP_PREFIX + "merge_manifests";
+      Constants.TOOLS_REPOSITORY + "//tools/android:merge_manifests";
   public static final String BUILD_INCREMENTAL_DEXMANIFEST_LABEL =
-      Constants.ANDROID_DEP_PREFIX + "build_incremental_dexmanifest";
+      Constants.TOOLS_REPOSITORY + "//tools/android:build_incremental_dexmanifest";
   public static final String STUBIFY_MANIFEST_LABEL =
-      Constants.ANDROID_DEP_PREFIX + "stubify_manifest";
+      Constants.TOOLS_REPOSITORY + "//tools/android:stubify_manifest";
   public static final String INCREMENTAL_INSTALL_LABEL =
-      Constants.ANDROID_DEP_PREFIX + "incremental_install";
+      Constants.TOOLS_REPOSITORY + "//tools/android:incremental_install";
   public static final String BUILD_SPLIT_MANIFEST_LABEL =
-      Constants.ANDROID_DEP_PREFIX + "build_split_manifest";
+      Constants.TOOLS_REPOSITORY + "//tools/android:build_split_manifest";
   public static final String STRIP_RESOURCES_LABEL =
-      Constants.ANDROID_DEP_PREFIX + "strip_resources";
+      Constants.TOOLS_REPOSITORY + "//tools/android:strip_resources";
 
   public static final Label DEFAULT_ANDROID_SDK =
       Label.parseAbsoluteUnchecked(
           Constants.ANDROID_DEFAULT_SDK);
   public static final Label DEFAULT_INCREMENTAL_STUB_APPLICATION =
       Label.parseAbsoluteUnchecked(
-          Constants.ANDROID_DEP_PREFIX + "incremental_stub_application");
+          Constants.TOOLS_REPOSITORY + "//tools/android:incremental_stub_application");
   public static final Label DEFAULT_INCREMENTAL_SPLIT_STUB_APPLICATION =
       Label.parseAbsoluteUnchecked(
-          Constants.ANDROID_DEP_PREFIX + "incremental_split_stub_application");
+          Constants.TOOLS_REPOSITORY + "//tools/android:incremental_split_stub_application");
   public static final Label DEFAULT_RESOURCES_PROCESSOR =
-      Label.parseAbsoluteUnchecked(Constants.ANDROID_DEP_PREFIX + "resources_processor");
+      Label.parseAbsoluteUnchecked(
+          Constants.TOOLS_REPOSITORY + "//tools/android:resources_processor");
   public static final Label DEFAULT_AAR_GENERATOR =
-      Label.parseAbsoluteUnchecked(Constants.ANDROID_DEP_PREFIX + "aar_generator");
+      Label.parseAbsoluteUnchecked(Constants.TOOLS_REPOSITORY + "//tools/android:aar_generator");
 
   /**
    * Implementation for the :proguard attribute.
@@ -539,7 +540,7 @@ public final class AndroidRuleClasses {
               .value(env.getLabel(
                   Constants.TOOLS_REPOSITORY + "//third_party/java/jarjar:jarjar_bin")))
           .add(attr("$idlclass", LABEL).cfg(HOST).exec()
-              .value(env.getLabel(Constants.ANDROID_DEP_PREFIX + "IdlClass")))
+              .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/android:IdlClass")))
           .build();
     }
 
@@ -603,9 +604,9 @@ public final class AndroidRuleClasses {
           .add(attr("$stubify_manifest", LABEL).cfg(HOST).exec()
               .value(env.getLabel(AndroidRuleClasses.STUBIFY_MANIFEST_LABEL)))
           .add(attr("$shuffle_jars", LABEL).cfg(HOST).exec()
-              .value(env.getLabel(Constants.ANDROID_DEP_PREFIX + "shuffle_jars")))
+              .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/android:shuffle_jars")))
           .add(attr("$merge_dexzips", LABEL).cfg(HOST).exec()
-              .value(env.getLabel(Constants.ANDROID_DEP_PREFIX + "merge_dexzips")))
+              .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/android:merge_dexzips")))
           .add(attr("$incremental_install", LABEL).cfg(HOST).exec()
               .value(env.getLabel(INCREMENTAL_INSTALL_LABEL)))
           .add(attr("$build_split_manifest", LABEL).cfg(HOST).exec()
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index 0849ac1261..6bbbd8255f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -31,7 +31,6 @@ import com.google.devtools.build.lib.bazel.repository.RepositoryFunction;
 import com.google.devtools.build.lib.bazel.rules.BazelConfiguration;
 import com.google.devtools.build.lib.bazel.rules.BazelConfigurationCollection;
 import com.google.devtools.build.lib.bazel.rules.BazelRuleClassProvider;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidRepositoryRules;
 import com.google.devtools.build.lib.bazel.rules.python.BazelPythonConfiguration;
 import com.google.devtools.build.lib.bazel.rules.workspace.LocalRepositoryRule;
 import com.google.devtools.build.lib.packages.Attribute;
@@ -78,11 +77,6 @@ public class BazelAnalysisMock extends AnalysisMock {
                 "  actual = '//objcproto:ProtocolBuffersCPP_lib',",
                 ")",
                 "bind(name = 'android/sdk', actual='//tools/android:sdk')"));
-    ImmutableList<String> tools = AndroidRepositoryRules.toolsForTesting();
-    for (String tool : tools) {
-      workspaceContents.add(
-          "bind(name = 'android/" + tool + "', actual = '//tools/android:" + tool + "')");
-    }
 
     config.overwrite("WORKSPACE", workspaceContents.toArray(new String[workspaceContents.size()]));
     config.create("tools/jdk/BUILD",
diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh
index 3219a8013b..9c19324943 100755
--- a/src/test/shell/bazel/test-setup.sh
+++ b/src/test/shell/bazel/test-setup.sh
@@ -244,11 +244,6 @@ android_sdk_repository(
     build_tools_version = "$ANDROID_SDK_TOOLS_VERSION",
     api_level = $ANDROID_SDK_API_LEVEL,
 )
-
-android_local_tools_repository(
-    name = "androidtools",
-    path = "$ANDROID_TOOLS",
-)
 EOF
 }