Fixes J2ObjC support. Adds a BUILD.tools and updates BUILD.remote with

the necessary targets depended upon by J2ObjCAspect.java.

Change-Id: I0a93378029707f0ebbda3a30b947519a385243f1

3 files changed, 64 insertions, 26 deletions

diff --git a/third_party/java/j2objc/BUILD b/third_party/java/j2objc/BUILD
index bb1cd5c565..79405d56d6 100644
--- a/third_party/java/j2objc/BUILD
+++ b/third_party/java/j2objc/BUILD
@@ -26,26 +26,10 @@ filegroup(
     visibility = ["//third_party:__pkg__"],
 )
 
-java_library(
-    name = "annotations",
-    exports = ["@bazel_j2objc//:annotations"],
-)
-
-genrule(
-    name = "jre_emul_jar",
-    srcs = ["@bazel_j2objc//:jre_emul.jar"],
-    outs = ["jre_emul.jar"],
-    cmd = "cp $< $@",
-)
-
-objc_library(
-    name = "jre_emul_lib",
-    sdk_dylibs = [
-        "libicucore",
-        "libz",
-    ],
-    sdk_frameworks = [
-        "Security",
+filegroup(
+    name = "embedded_tools_srcs",
+    srcs = [
+        "BUILD.remote",
+        "BUILD.tools",
     ],
-    deps = ["@bazel_j2objc//:jre_emul_archive"],
 )
diff --git a/third_party/java/j2objc/BUILD.remote b/third_party/java/j2objc/BUILD.remote
index 44daaf8a3e..f96701ff55 100644
--- a/third_party/java/j2objc/BUILD.remote
+++ b/third_party/java/j2objc/BUILD.remote
@@ -40,15 +40,21 @@ java_import(
     exports = [":annotations"],
 )
 
+objc_import(
+    name = "jre_core_lib",
+    hdrs = glob([J2_DIR + "include/**"]),
+    includes = [J2_DIR + "include"],
+    archives = [J2_DIR + "lib/libjre_core.a"],
+)
+
 filegroup(
-    name = "jre_emul_headers",
-    #srcs = glob([J2_DIR + "include/IOSClass.h"]),
-    srcs = [J2_DIR + "include/IOSClass.h"],
+    name = "proto_plugin",
+    srcs = [J2_DIR + "j2objc_protoc_plugin"]
 )
 
 objc_import(
-    name = "jre_emul_archive",
+    name = "proto_runtime",
     hdrs = glob([J2_DIR + "include/**"]),
     includes = [J2_DIR + "include"],
-    archives = [J2_DIR + "lib/libjre_emul.a"],
+    archives = [J2_DIR + "lib/libprotobuf_runtime.a"],
 )
diff --git a/third_party/java/j2objc/BUILD.tools b/third_party/java/j2objc/BUILD.tools
new file mode 100644
index 0000000000..4f9c9947e7
--- /dev/null
+++ b/third_party/java/j2objc/BUILD.tools
@@ -0,0 +1,48 @@
+# Copyright 2015 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+licenses(["notice"])  # Apache License 2.0
+
+exports_files(["LICENSE"])
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+java_library(
+    name = "annotations",
+    exports = ["@bazel_j2objc//:annotations"],
+)
+
+genrule(
+    name = "jre_emul_jar",
+    srcs = ["@bazel_j2objc//:jre_emul.jar"],
+    outs = ["jre_emul.jar"],
+    cmd = "cp $< $@",
+)
+
+objc_library(
+    name = "jre_core_lib",
+    deps = ["@bazel_j2objc//:jre_core_lib"],
+)
+
+filegroup(
+    name = "proto_plugin",
+    srcs = ["@bazel_j2objc//:proto_plugin"],
+)
+
+objc_library(
+    name = "proto_runtime",
+    deps = ["@bazel_j2objc//:proto_runtime"],
+)