diff options
| author |  Googler <noreply@google.com> | 2017-05-30 22:21:19 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-05-31 09:20:28 +0200 |
| commit | 22ad69d69170c4dc6f3dc2a87cfac3620690ca01 (patch) | |
| tree | ef633e71b5dfbae0ba225675b205d6d547151d6f | |
| parent | 886a80ff71e53d7035056df8099950426c109c33 (diff) | |
Adds external J2ObjC BUILD files to Bazel's generated embedded_tools directory,
and fixes some of J2ObjC's implicit deps to correctly reference the embedded tools.
RELNOTES: Partially fixes external J2ObjC support.
PiperOrigin-RevId: 157503022
| -rw-r--r-- | examples/j2objc/BUILD | 2 | ||||
| -rw-r--r-- | src/BUILD | 1 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/examples/j2objc/BUILD b/examples/j2objc/BUILD index 0a3d3894cf..5c0b005ebc 100644 --- a/examples/j2objc/BUILD +++ b/examples/j2objc/BUILD @@ -16,7 +16,7 @@ java_library( name = "J2ObjcExample-Java", srcs = glob(["src/main/java/**/*.java"]), deps = [ - "//third_party/java/j2objc:annotations", + "@bazel_j2objc//:annotations", ], ) @@ -129,6 +129,7 @@ filegroup( ":create_embedded_tools.sh", "//tools:embedded_tools_srcs", "//third_party:gpl-srcs", + "//third_party/java/j2objc:embedded_tools_srcs", "//third_party/java/jarjar:embedded_tools_srcs", "//third_party/java/jdk/langtools:test-srcs", "//third_party/py/concurrent:srcs", 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 8f6c700579..f44a4cb86a 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 @@ -184,10 +184,14 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF .cfg(HOST) .value(DEAD_CODE_REPORT)) .add(attr("$jre_lib", LABEL) - .value(Label.parseAbsoluteUnchecked("//third_party/java/j2objc:jre_core_lib"))) + .value( + Label.parseAbsoluteUnchecked( + toolsRepository + "//third_party/java/j2objc:jre_core_lib"))) .add( attr("$protobuf_lib", LABEL) - .value(Label.parseAbsoluteUnchecked("//third_party/java/j2objc:proto_runtime"))) + .value( + Label.parseAbsoluteUnchecked( + toolsRepository + "//third_party/java/j2objc:proto_runtime"))) .add( attr("$xcrunwrapper", LABEL) .cfg(HOST) |