aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-05-30 22:21:19 +0200
committerGravatar László Csomor <laszlocsomor@google.com>2017-05-31 09:20:28 +0200
commit22ad69d69170c4dc6f3dc2a87cfac3620690ca01 (patch)
treeef633e71b5dfbae0ba225675b205d6d547151d6f /src
parent886a80ff71e53d7035056df8099950426c109c33 (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
Diffstat (limited to 'src')
-rw-r--r--src/BUILD1
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java8
2 files changed, 7 insertions, 2 deletions
diff --git a/src/BUILD b/src/BUILD
index fcb7ad02ae..756eb39738 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -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)