Add @bazel_tools prefix to objc tools

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

--
MOS_MIGRATED_REVID=112489640

3 files changed, 7 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java
index d557c06fd9..b2ce8f9f97 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java
@@ -52,7 +52,7 @@ public class BazelJ2ObjcProtoAspect extends AbstractJ2ObjcProtoAspect {
             .cfg(HOST)
             .exec()
             .value(parseLabel(
-                "//third_party/java/j2objc:proto_plugin")));
+                Constants.TOOLS_REPOSITORY + "//third_party/java/j2objc:proto_plugin")));
   }
 
     @Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java
index 596adfb05a..3061f9c6f4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java
@@ -18,6 +18,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.syntax.Type.STRING_LIST;
 
+import com.google.devtools.build.lib.Constants;
 import com.google.devtools.build.lib.analysis.BaseRuleClasses;
 import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
@@ -46,9 +47,11 @@ public class J2ObjcLibraryBaseRule implements RuleDefinition {
           <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/
         .add(attr("entry_classes", STRING_LIST))
         .add(attr("$jre_emul_lib", LABEL)
-            .value(env.getLabel("//third_party/java/j2objc:jre_emul_lib")))
+            .value(env.getLabel(
+                Constants.TOOLS_REPOSITORY + "//third_party/java/j2objc:jre_emul_lib")))
         .add(attr("$protobuf_lib", LABEL)
-            .value(env.getLabel("//third_party/java/j2objc:proto_runtime")))
+            .value(env.getLabel(
+                Constants.TOOLS_REPOSITORY + "//third_party/java/j2objc:proto_runtime")))
         .build();
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index aecd1f5583..7ee1ca8240 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -1042,7 +1042,7 @@ public class ObjcRuleClasses {
       return builder
           // Needed to run the binary in the simulator.
           .add(attr("$iossim", LABEL).cfg(HOST).exec()
-              .value(env.getLabel("//third_party/iossim:iossim")))
+              .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//third_party/iossim:iossim")))
           .add(attr("$std_redirect_dylib", LABEL).cfg(HOST).exec()
               .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:StdRedirect.dylib")))
           .build();