diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2016-02-09 23:38:25 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-02-10 10:26:23 +0000 |
| commit | 707b171601f4bf58028bd5186bc8618a0d9ae88b (patch) | |
| tree | b0310e89e42a1b6aa6716d65b5e2f11dec6abbb6 /src | |
| parent | 492472fc8232775109a7bc9fae28dd2d4c752e63 (diff) | |
Temporary fix for xcode project generation
The xcodegen script does not yet handle looking for files under @bazel_tools
correctly. This change will let xcode find these targets under the workspace
root, instead of the @bazel_tools repository. Note that this means that the
package path must include third_party/java/j2objc if it does not exist in your
workspace.
--
MOS_MIGRATED_REVID=114268000
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java | 3 |
2 files changed, 2 insertions, 4 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 06ef12391c..f9cb428ec1 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,8 +74,7 @@ public abstract class AbstractJ2ObjcProtoAspect implements ConfiguredNativeAspec .attributeAspect("exports", getClass()) .attributeAspect("runtime_deps", getClass()) .add(attr("$protobuf_lib", LABEL) - .value(Label.parseAbsoluteUnchecked( - Constants.TOOLS_REPOSITORY + "//third_party/java/j2objc:proto_runtime"))) + .value(Label.parseAbsoluteUnchecked("//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 e2d7e5d1b2..5103e5640a 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,8 +96,7 @@ public class J2ObjcAspect implements ConfiguredNativeAspectFactory { .value(Label.parseAbsoluteUnchecked( Constants.TOOLS_REPOSITORY + "//tools/j2objc:j2objc_wrapper"))) .add(attr("$jre_emul_lib", LABEL) - .value(Label.parseAbsoluteUnchecked( - Constants.TOOLS_REPOSITORY + "//third_party/java/j2objc:jre_emul_lib"))) + .value(Label.parseAbsoluteUnchecked("//third_party/java/j2objc:jre_emul_lib"))) .add(attr("$xcrunwrapper", LABEL).cfg(HOST).exec() .value(Label.parseAbsoluteUnchecked( Constants.TOOLS_REPOSITORY + "//tools/objc:xcrunwrapper"))) |