Add @bazel_tools prefix to Java tools

This is in preparation for removing the requirement that base_workspace be in
bazel's package_path.

--
MOS_MIGRATED_REVID=112477785

3 files changed, 19 insertions, 16 deletions

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 916e59d944..4ab4442667 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,16 +1,16 @@
-# 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")
-# bind(name = "android/stubify_manifest", actual = "//tools/android:stubify_manifest")
-# bind(name = "android/incremental_install", actual = "//tools/android:incremental_install")
-# bind(name = "android/build_split_manifest", actual = "//tools/android:build_split_manifest")
-# bind(name = "android/strip_resources", actual = "//tools/android:strip_resources")
-# bind(name = "android/incremental_stub_application", actual = "//tools/android:incremental_stub_application")
-# bind(name = "android/incremental_split_stub_application", actual = "//tools/android:incremental_split_stub_application")
-# bind(name = "android/resources_processor", actual = "//tools/android:resources_processor")
-# bind(name = "android/aar_generator", actual = "//tools/android:aar_generator")
-# bind(name = "android/shuffle_jars", actual = "//tools/android:shuffle_jars")
-# bind(name = "android/merge_dexzips", actual = "//tools/android:merge_dexzips")
+# bind(name = "android/proguard_whitelister", actual = "@bazel_tools//tools/android:proguard_whitelister")
+# bind(name = "android/merge_manifests", actual = "@bazel_tools//tools/android:merge_manifests")
+# bind(name = "android/build_incremental_dexmanifest", actual = "@bazel_tools//tools/android:build_incremental_dexmanifest")
+# bind(name = "android/stubify_manifest", actual = "@bazel_tools//tools/android:stubify_manifest")
+# bind(name = "android/incremental_install", actual = "@bazel_tools//tools/android:incremental_install")
+# bind(name = "android/build_split_manifest", actual = "@bazel_tools//tools/android:build_split_manifest")
+# bind(name = "android/strip_resources", actual = "@bazel_tools//tools/android:strip_resources")
+# bind(name = "android/incremental_stub_application", actual = "@bazel_tools//tools/android:incremental_stub_application")
+# bind(name = "android/incremental_split_stub_application", actual = "@bazel_tools//tools/android:incremental_split_stub_application")
+# bind(name = "android/resources_processor", actual = "@bazel_tools//tools/android:resources_processor")
+# bind(name = "android/aar_generator", actual = "@bazel_tools//tools/android:aar_generator")
+# bind(name = "android/shuffle_jars", actual = "@bazel_tools//tools/android:shuffle_jars")
+# bind(name = "android/merge_dexzips", actual = "@bazel_tools//tools/android:merge_dexzips")
 bind(name = "android/sdk")
 bind(name = "android/crosstool", actual = "@bazel_tools//tools/cpp:toolchain")
 bind(name = "android/appcompat_v4")
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
index b502cdcc1f..86bd7d87dd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java
@@ -18,6 +18,7 @@ import static com.google.devtools.build.lib.packages.ImplicitOutputsFunction.fro
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.lib.Constants;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.LanguageDependentFragment.LibraryLanguage;
 import com.google.devtools.build.lib.analysis.OutputGroupProvider;
@@ -135,8 +136,8 @@ public interface JavaSemantics {
    * Label of pseudo-cc_binary that tells Blaze a java target's JAVABIN is never to be replaced by
    * the contents of --java_launcher; only the JDK's launcher will ever be used.
    */
-  Label JDK_LAUNCHER_LABEL =
-      Label.parseAbsoluteUnchecked("//third_party/java/jdk:jdk_launcher");
+  Label JDK_LAUNCHER_LABEL = Label.parseAbsoluteUnchecked(
+      Constants.TOOLS_REPOSITORY + "//third_party/java/jdk:jdk_launcher");
 
   /**
    * Implementation for the :jvm attribute.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/ProguardLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/ProguardLibraryRule.java
index 74d84eb198..e3d37e3fd6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/ProguardLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/ProguardLibraryRule.java
@@ -19,6 +19,7 @@ import static com.google.devtools.build.lib.packages.Attribute.attr;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST;
 
+import com.google.devtools.build.lib.Constants;
 import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
 import com.google.devtools.build.lib.packages.Attribute;
@@ -51,7 +52,8 @@ public final class ProguardLibraryRule implements RuleDefinition {
               @Override
               public Object getDefault(AttributeMap rule) {
                 return rule.isAttributeValueExplicitlySpecified("proguard_specs")
-                    ? environment.getLabel("//tools/jdk:proguard_whitelister")
+                    ? environment.getLabel(
+                        Constants.TOOLS_REPOSITORY + "//tools/jdk:proguard_whitelister")
                     : null;
               }
             }))