commit ebdbdcd45e8bbfe244f75b5fb06fff63045bb139
author iirina <elenairina@google.com> Tue Apr 09 04:43:08 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 09 04:44:37 2019 -0700
tree 018bef7420f1c7d81d4067b8db7f4841fba8a610
parent 843d18c5292b72d5a7bddc4aa9a9a8947cb57a3c

Remove singlejar from bazel binary

Remove singlejar from the bazel binary and use singlejar from the java_tools instead.

Upgrade the java_tools version in bazel to the version that includes singlejar.

Closes #7952.

PiperOrigin-RevId: 242643670

tools/jdk/BUILD.java_tools

diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools
index 2a56bf2..61962e8 100644
--- a/tools/jdk/BUILD.java_tools
+++ b/tools/jdk/BUILD.java_tools
@@ -99,6 +99,25 @@
 )
 
 alias(
+    name = "singlejar",
+    actual = select({
+         "//:remote": ":singlejar_cc_bin",
+         "//conditions:default": ":singlejar_prebuilt_or_cc_binary",
+     }),
+)
+
+alias(
+    name = "singlejar_prebuilt_or_cc_binary",
+    actual = select({
+          ":linux_x86_64": "java_tools/src/tools/singlejar/singlejar_local",
+          ":darwin": "java_tools/src/tools/singlejar/singlejar_local",
+          ":darwin_x86_64": "java_tools/src/tools/singlejar/singlejar_local",
+          ":windows": "java_tools/src/tools/singlejar/singlejar_local.exe",
+          "//conditions:default": "singlejar_cc_bin",
+      })
+)
+
+alias(
   name = "ijar",
   actual = select({
       ":remote": ":ijar_cc_binary",
@@ -340,7 +359,7 @@
 ##################### singlejar
 
 cc_binary(
-    name = "singlejar",
+    name = "singlejar_cc_bin",
     srcs = [
         "java_tools/src/tools/singlejar/singlejar_main.cc",
     ],
@@ -381,10 +400,12 @@
     name = "combiners",
     srcs = [
         "java_tools/src/tools/singlejar/combiners.cc",
+    ],
+    hdrs = [
+        "java_tools/src/tools/singlejar/combiners.h",
         ":transient_bytes",
         ":zip_headers",
     ],
-    hdrs = ["java_tools/src/tools/singlejar/combiners.h"],
     strip_include_prefix = "java_tools",
     deps = [
         "//java_tools/zlib",
@@ -428,17 +449,18 @@
 
 cc_library(
     name = "mapped_file",
-    srcs = ["java_tools/src/tools/singlejar/mapped_file.cc"] + select({
-        ":windows": ["java_tools/src/tools/singlejar/mapped_file_windows.inc"],
-        "//conditions:default": ["java_tools/src/tools/singlejar/mapped_file_posix.inc"],
-    }),
-    hdrs = ["java_tools/src/tools/singlejar/mapped_file.h"],
+    srcs = ["java_tools/src/tools/singlejar/mapped_file.cc"],
+    hdrs = ["java_tools/src/tools/singlejar/mapped_file.h"] +
+        select({
+            ":windows": ["java_tools/src/tools/singlejar/mapped_file_windows.inc"],
+            "//conditions:default": ["java_tools/src/tools/singlejar/mapped_file_posix.inc"],
+        }),
     visibility = ["//visibility:private"],
     strip_include_prefix = "java_tools",
     deps = [
         ":diag",
         ":singlejar_port",
-        "//src/main/cpp/util",
+        ":cpp_util",
     ],
 )
 
@@ -487,7 +509,7 @@
         ":mapped_file",
         ":options",
         ":singlejar_port",
-        "//src/main/cpp/util",
+        ":cpp_util",
         "//java_tools/zlib",
     ],
     strip_include_prefix = "java_tools",