From 52b3868d9723758696e8c96ce952e975271d2c68 Mon Sep 17 00:00:00 2001 From: Lukacs Berki Date: Tue, 27 Oct 2015 09:04:28 +0000 Subject: 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 --- .../google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib') 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 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", -- cgit v1.2.3