Busybox all the Bazel Android tools.

This change reduces the size taken up in the bazel binary by Android tools deploy jars from 38.2 mb to 9.8 mb, which is 15% of the bazel binary size. Also, some minor cleanups of our BUILD files.

https://github.com/bazelbuild/bazel/issues/2385

RELNOTES: None
PiperOrigin-RevId: 166373241

2 files changed, 17 insertions, 71 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
index 81fc56cd2e..a53afc217f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD
@@ -1,7 +1,10 @@
 # Low level zip archive processing library.
 
 package(
-    default_visibility = ["//visibility:public"],
+    default_visibility = [
+        "//src/test/java/com/google/devtools/build/android/ziputils:__pkg__",
+        "//src/tools/android/java/com/google/devtools/build/android:__pkg__",
+    ],
 )
 
 filegroup(
@@ -11,41 +14,14 @@ filegroup(
 
 filegroup(
     name = "embedded_tools",
-    srcs = [
-        "BUILD.tools",
-        "all_deploy.jar",
-    ],
+    srcs = ["BUILD.tools"],
 )
 
 java_library(
     name = "ziputils_lib",
-    srcs = glob(
-        ["*.java"],
-        exclude = [
-            "DexMapper.java",
-            "DexReducer.java",
-            "SplitZip.java",
-            "SplitZipFilters.java",
-            "Splitter.java",
-        ],
-    ),
-    visibility = ["//visibility:public"],
+    srcs = glob(["*.java"]),
     deps = [
-        "//third_party:guava",
-        "//third_party:jsr305",
-    ],
-)
-
-java_library(
-    name = "splitter_lib",
-    srcs = [
-        "SplitZip.java",
-        "SplitZipFilters.java",
-        "Splitter.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":ziputils_lib",
+        "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:jsr305",
     ],
@@ -53,43 +29,14 @@ java_library(
 
 java_binary(
     name = "mapper",
-    srcs = [
-        "DexMapper.java",
-    ],
     main_class = "com.google.devtools.build.android.ziputils.DexMapper",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":splitter_lib",
-        "//src/main/java/com/google/devtools/common/options",
-        "//third_party:guava",
-    ],
+    visibility = ["//visibility:private"],
+    runtime_deps = [":ziputils_lib"],
 )
 
 java_binary(
     name = "reducer",
-    srcs = [
-        "DexReducer.java",
-    ],
     main_class = "com.google.devtools.build.android.ziputils.DexReducer",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":ziputils_lib",
-        "//src/main/java/com/google/devtools/common/options",
-        "//third_party:guava",
-    ],
-)
-
-java_binary(
-    name = "all",
-    srcs = [
-        "DexMapper.java",
-        "DexReducer.java",
-    ],
-    main_class = "does.not.exist",
-    deps = [
-        ":splitter_lib",
-        ":ziputils_lib",
-        "//src/main/java/com/google/devtools/common/options",
-        "//third_party:guava",
-    ],
+    visibility = ["//visibility:private"],
+    runtime_deps = [":ziputils_lib"],
 )
diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD.tools
index e86fad0efd..3e0df0b49f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD.tools
+++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/BUILD.tools
@@ -1,18 +1,17 @@
 package(default_visibility = ["//visibility:public"])
 
-java_import(
-    name = "classes",
-    jars = [":all_deploy.jar"],
-)
-
 java_binary(
     name = "mapper",
     main_class = "com.google.devtools.build.android.ziputils.DexMapper",
-    runtime_deps = [":classes"],
+    runtime_deps = [
+        "//src/tools/android/java/com/google/devtools/build/android:all_android_tools",
+    ],
 )
 
 java_binary(
     name = "reducer",
     main_class = "com.google.devtools.build.android.ziputils.DexReducer",
-    runtime_deps = [":classes"],
+    runtime_deps = [
+        "//src/tools/android/java/com/google/devtools/build/android:all_android_tools",
+    ],
 )