diff options
| author |  Rumou Duan <rduan@google.com> | 2016-02-05 23:31:03 +0000 |
|---|---|---|
| committer |  David Chen <dzc@google.com> | 2016-02-07 11:33:32 +0000 |
| commit | 9bfeb5b1732e00e506d56405513b8c85ceea6ad7 (patch) | |
| tree | 2b2090713ffa8cb3edc51d8f642b669b11e7e8da /src | |
| parent | 36a0001f7455fd80981bd8fe1c9c8501bfcdfcd8 (diff) | |
Prepend Constants.TOOLS_REPOSITORY to implicit J2ObjC dependency labels.
--
MOS_MIGRATED_REVID=113991707
Diffstat (limited to 'src')
3 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java index f9cb428ec1..06ef12391c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java @@ -74,7 +74,8 @@ public abstract class AbstractJ2ObjcProtoAspect implements ConfiguredNativeAspec .attributeAspect("exports", getClass()) .attributeAspect("runtime_deps", getClass()) .add(attr("$protobuf_lib", LABEL) - .value(Label.parseAbsoluteUnchecked("//third_party/java/j2objc:proto_runtime"))) + .value(Label.parseAbsoluteUnchecked( + Constants.TOOLS_REPOSITORY + "//third_party/java/j2objc:proto_runtime"))) .add(attr("$xcrunwrapper", LABEL).cfg(HOST).exec() .value(Label.parseAbsoluteUnchecked( Constants.TOOLS_REPOSITORY + "//tools/objc:xcrunwrapper"))) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java index 5103e5640a..e2d7e5d1b2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java @@ -96,7 +96,8 @@ public class J2ObjcAspect implements ConfiguredNativeAspectFactory { .value(Label.parseAbsoluteUnchecked( Constants.TOOLS_REPOSITORY + "//tools/j2objc:j2objc_wrapper"))) .add(attr("$jre_emul_lib", LABEL) - .value(Label.parseAbsoluteUnchecked("//third_party/java/j2objc:jre_emul_lib"))) + .value(Label.parseAbsoluteUnchecked( + Constants.TOOLS_REPOSITORY + "//third_party/java/j2objc:jre_emul_lib"))) .add(attr("$xcrunwrapper", LABEL).cfg(HOST).exec() .value(Label.parseAbsoluteUnchecked( Constants.TOOLS_REPOSITORY + "//tools/objc:xcrunwrapper"))) 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 65b98ca456..c8bbb652e0 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 @@ -741,7 +741,7 @@ public class ObjcRuleClasses { .value(env.getLabel( env.getToolsRepository() + "//tools/objc:j2objc_dead_code_pruner"))) .add(attr("$dummy_lib", LABEL) - .value(env.getLabel("//tools/objc:dummy_lib"))) + .value(env.getLabel(env.getToolsRepository() + "//tools/objc:dummy_lib"))) .build(); } @Override |