diff options
3 files changed, 16 insertions, 7 deletions
@@ -33,13 +33,6 @@ bind( actual = "//third_party/py/six", ) -new_http_archive( - name = "bazel_j2objc", - url = "https://github.com/google/j2objc/releases/download/1.0.1/j2objc-1.0.1.zip", - sha256 = "25cd1da1c2ca2f446bcd9e663da1e1776316547f4b14785709d07ce888c34d67", - build_file = __embedded_dir__ + "/embedded_tools/third_party/java/j2objc/BUILD.remote" -) - # For src/test/docker/... load("//src/test/docker:docker_repository.bzl", "docker_repository") diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index a1907236d2..86b5e20cad 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -641,6 +641,14 @@ public class BazelRuleClassProvider { builder.addNativeAspectClass(j2ObjcAspect); builder.addRuleDefinition(new J2ObjcLibraryBaseRule()); builder.addRuleDefinition(new J2ObjcLibraryRule(j2ObjcAspect)); + + try { + builder.addWorkspaceFilePrefix( + ResourceFileLoader.loadResource( + BazelRuleClassProvider.class, "objc/j2objc.WORKSPACE")); + } catch (IOException e) { + throw new IllegalStateException(e); + } } @Override diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE new file mode 100644 index 0000000000..a2c860696c --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE @@ -0,0 +1,8 @@ +# External dependencies for the java_* rules. + +new_http_archive( + name = "bazel_j2objc", + url = "https://github.com/google/j2objc/releases/download/1.0.1/j2objc-1.0.1.zip", + sha256 = "25cd1da1c2ca2f446bcd9e663da1e1776316547f4b14785709d07ce888c34d67", + build_file = __embedded_dir__ + "/embedded_tools/third_party/java/j2objc/BUILD.remote" +) |