Skip to content

Commit

Permalink
Adds external J2ObjC BUILD files to Bazel's generated embedded_tools …
Browse files Browse the repository at this point in the history
…directory,

and fixes some of J2ObjC's implicit deps to correctly reference the embedded tools.
RELNOTES: Partially fixes external J2ObjC support.

PiperOrigin-RevId: 157503022
  • Loading branch information
Googler authored and laszlocsomor committed May 31, 2017
1 parent 886a80f commit 22ad69d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion examples/j2objc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ java_library(
name = "J2ObjcExample-Java",
srcs = glob(["src/main/java/**/*.java"]),
deps = [
"//third_party/java/j2objc:annotations",
"@bazel_j2objc//:annotations",
],
)

Expand Down
1 change: 1 addition & 0 deletions src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,14 @@ public AspectDefinition getDefinition(AspectParameters aspectParameters) {
.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)
Expand Down

0 comments on commit 22ad69d

Please sign in to comment.