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

1 files changed, 0 insertions, 6 deletions

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",