From 464caa54500f65fa4dad1c3031602f4338cd1b23 Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Wed, 27 Jan 2016 17:09:13 +0000 Subject: Rollback of commit 38c537da56fa8633aa30b6fec1ab5aeee432e038. *** Reason for rollback *** Breaks genrule referencing //pkg from @bazel_tools *** Original change description *** 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=113167322 --- .../devtools/build/lib/rules/objc/BazelJ2ObjcProtoAspect.java | 2 +- .../devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java | 7 ++----- .../com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/main/java') 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 b2ce8f9f97..d557c06fd9 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( - Constants.TOOLS_REPOSITORY + "//third_party/java/j2objc:proto_plugin"))); + "//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 677aa37872..23a82646e7 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,7 +18,6 @@ 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; @@ -47,11 +46,9 @@ public class J2ObjcLibraryBaseRule implements RuleDefinition { */ .add(attr("entry_classes", STRING_LIST)) .add(attr("$jre_emul_lib", LABEL) - .value(env.getLabel( - Constants.TOOLS_REPOSITORY + "//third_party/java/j2objc:jre_emul_lib"))) + .value(env.getLabel("//third_party/java/j2objc:jre_emul_lib"))) .add(attr("$protobuf_lib", LABEL) - .value(env.getLabel( - Constants.TOOLS_REPOSITORY + "//third_party/java/j2objc:proto_runtime"))) + .value(env.getLabel("//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 c8229a2e6f..1742eadba0 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(Constants.TOOLS_REPOSITORY + "//third_party/iossim:iossim"))) + .value(env.getLabel("//third_party/iossim:iossim"))) .add(attr("$std_redirect_dylib", LABEL).cfg(HOST).exec() .value(env.getLabel(Constants.TOOLS_REPOSITORY + "//tools/objc:StdRedirect.dylib"))) .build(); -- cgit v1.2.3