Move all J2ObjC Bazel dependencies to third_party/java/j2objc.

-- MOS_MIGRATED_REVID=103303357
helenalt · Sep 17, 2015 · d316442 · d316442
1 parent 083fe29
commit d316442
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 42 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java
@@ -46,7 +46,7 @@ public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
           <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/
         .add(attr("entry_classes", STRING_LIST))
         .add(attr("$jre_emul_lib", LABEL)
-            .value(env.getLabel("//third_party/java_src/j2objc/jre_emul:jre_emul_lib")))
+            .value(env.getLabel("//third_party/java/j2objc:jre_emul_lib")))
         .build();
   }
 

diff --git a/third_party/BUILD b/third_party/BUILD
@@ -10,7 +10,6 @@ filegroup(
         "//third_party/java/j2objc:srcs",
         "//third_party/java/jarjar:srcs",
         "//third_party/java/jdk/langtools:srcs",
-        "//third_party/java_src/j2objc/jre_emul:srcs",
         "//third_party/py/concurrent:srcs",
         "//third_party/py/gflags:srcs",
         "//third_party/py/mock:srcs",

diff --git a/third_party/java/j2objc/BUILD b/third_party/java/j2objc/BUILD
@@ -30,3 +30,15 @@ java_library(
     name = "annotations",
     srcs = ["@bazel-j2objc//:annotations"],
 )
+
+objc_library(
+    name = "jre_emul_lib",
+    sdk_dylibs = [
+        "libicucore",
+        "libz",
+    ],
+    sdk_frameworks = [
+        "Security",
+    ],
+    deps = ["@bazel-j2objc//:jre_emul_archive"],
+)
diff --git a/third_party/java_src/j2objc/jre_emul/BUILD b/third_party/java_src/j2objc/jre_emul/BUILD