Internal change

PiperOrigin-RevId: 162601644
ManishSeal · Jul 20, 2017 · 36cd45b · 36cd45b
1 parent 7ddf361
commit 36cd45b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -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
@@ -641,6 +641,14 @@ public void init(Builder builder) {
           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
@@ -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"
+)