Auto-generate BUILD files for src/java_tools/singlejar

This and further changes may contain minor modifications to BUILD files that
don't serve any apparent purpose. The reason for these changes is that we're
switching from checked-in BUILD files to generated BUILD files, and there may
be small differences between these files.

PiperOrigin-RevId: 163525889

5 files changed, 180 insertions, 80 deletions

diff --git a/src/java_tools/singlejar/BUILD b/src/java_tools/singlejar/BUILD
index f1bd34146a..f27e78e67c 100644
--- a/src/java_tools/singlejar/BUILD
+++ b/src/java_tools/singlejar/BUILD
@@ -5,90 +5,35 @@ package(default_visibility = ["//src:__subpackages__"])
 
 filegroup(
     name = "srcs",
-    srcs = glob(["**"]) + ["//src/java_tools/singlejar/java/com/google/devtools/build/zip:srcs"],
-    visibility = [
-        "//src:__pkg__",
-        "//src/test/shell/bazel:__pkg__",
+    srcs = glob(["*"]) + [
+        "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:srcs",
+        "//src/java_tools/singlejar/java/com/google/devtools/build/zip:srcs",
+        "//src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar:srcs",
+        "//src/java_tools/singlejar/javatests/com/google/devtools/build/zip:srcs",
     ],
 )
 
-java_library(
+alias(
     name = "libSingleJar",
-    srcs = glob(["java/**/singlejar/**/*.java"]),
-    visibility = [
-        "//src:__subpackages__",
-        "//third_party/java/apkbuilder:__pkg__",
-    ],
-    deps = [
-        "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
-        "//src/main/java/com/google/devtools/build/lib:shell",
-        "//src/main/protobuf:worker_protocol_java_proto",
-        "//third_party:jsr305",
-    ],
+    actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:libSingleJar",
 )
 
-java_binary(
+alias(
     name = "SingleJar",
-    main_class = "com.google.devtools.build.singlejar.SingleJar",
-    runtime_deps = [":libSingleJar"],
-)
-
-java_test(
-    name = "tests",
-    srcs = glob(["javatests/**/singlejar/**/*.java"]),
-    test_class = "com.google.devtools.build.singlejar.SingleJarTests",
-    deps = [
-        ":libSingleJar",
-        "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
-        "//src/main/java/com/google/devtools/build/lib:shell",
-        "//src/test/java/com/google/devtools/build/lib:testutil",
-        "//third_party:guava",
-        "//third_party:jsr305",
-        "//third_party:junit4",
-        "//third_party:truth",
-    ],
+    actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bazel-singlejar",
 )
 
-java_test(
-    name = "zipTests",
-    size = "enormous",
-    srcs = glob(["javatests/**/zip/**/*.java"]),
-    tags = ["zip"],
-    test_class = "com.google.devtools.build.zip.ZipTests",
-    deps = [
-        "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
-        "//src/test/java/com/google/devtools/build/lib:testutil",
-        "//third_party:guava",
-        "//third_party:guava-testlib",
-        "//third_party:junit4",
-        "//third_party:truth",
-    ],
+alias(
+    name = "SingleJar_deploy.jar",
+    actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bazel-singlejar_deploy.jar",
 )
 
-#
-# Bootstrapping using Skylark rules
-#
-load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary")
-
-bootstrap_java_library(
-    name = "skylark-deps",
-    jars = [
-        "//third_party:jsr305-jars",
-    ],
+alias(
+    name = "bootstrap",
+    actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bootstrap",
 )
 
-bootstrap_java_binary(
-    name = "bootstrap",
-    srcs = glob(
-        ["java/**/*.java"],
-        exclude = ["java/**/SingleJarWorker.java"],
-    ) + [
-        "//src/java_tools/singlejar/java/com/google/devtools/build/zip:java-srcs",
-    ],
-    main_class = "com.google.devtools.build.singlejar.SingleJar",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":skylark-deps",
-        "//src/main/java/com/google/devtools/build/lib:shell-skylark",
-    ],
+alias(
+    name = "bootstrap_deploy.jar",
+    actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bootstrap_deploy.jar",
 )
diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD
new file mode 100644
index 0000000000..9979b9d74c
--- /dev/null
+++ b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD
@@ -0,0 +1,91 @@
+# Description:
+#   SingleJar combines multiple zip files and additional files
+#   into a single zip file.
+package(default_visibility = ["//src:__subpackages__"])
+
+package_group(
+    name = "packages",
+    packages = [
+        "//java/com/google/devtools/build/singlejar",
+        "//javatests/com/google/devtools/build/singlejar",
+        "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar",
+        "//src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar",
+    ],
+)
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["*"]),
+)
+
+# This is used as a library outside of Bazel.
+java_library(
+    name = "libSingleJar",
+    srcs = [
+        "ConcatenateStrategy.java",
+        "CopyEntryFilter.java",
+        "DefaultJarEntryFilter.java",
+        "JarUtils.java",
+        "ZipCombiner.java",
+        "ZipEntryFilter.java",
+    ],
+    deps = [
+        "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
+        "//third_party:jsr305",
+    ],
+)
+
+java_library(
+    name = "libSingleJarMain",
+    srcs = glob(["**/*.java"]),
+    # Avoid adding dependencies here - this is a very low-level library and we don't want to pull in
+    # the world, even including commons.
+    deps = [
+        "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
+        "//src/main/java/com/google/devtools/build/lib:shell",
+        "//src/main/protobuf:worker_protocol_java_proto",
+        "//third_party:jsr305",
+    ],
+)
+
+java_binary(
+    name = "bazel-singlejar",
+    srcs = glob(["*.java"]),
+    main_class = "com.google.devtools.build.singlejar.SingleJar",
+    deps = [
+        "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
+        "//src/main/java/com/google/devtools/build/lib:shell",
+        "//src/main/protobuf:worker_protocol_java_proto",
+        "//third_party:jsr305",
+    ],
+)
+
+#
+# Bootstrapping using Skylark rules
+#
+
+load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary")
+
+bootstrap_java_library(
+    name = "skylark-deps",
+    jars = [
+        "//third_party:jsr305-jars",
+    ],
+    tags = ["manual"],
+)
+
+bootstrap_java_binary(
+    name = "bootstrap",
+    srcs = glob(
+        ["**/*.java"],
+        exclude = ["**/SingleJarWorker.java"],
+    ) + [
+        "//src/java_tools/singlejar/java/com/google/devtools/build/zip:java-srcs",
+    ],
+    main_class = "com.google.devtools.build.singlejar.SingleJar",
+    tags = ["manual"],
+    deps = [
+        ":skylark-deps",
+        "//src/main/java/com/google/devtools/build/lib:shell-skylark",
+    ],
+)
diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD
index db88908acc..00292119c1 100644
--- a/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD
+++ b/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD
@@ -2,9 +2,21 @@
 #   Zip provides a library for reading and writing zip files, allowing more
 #   advanced manipulation than the JDK equivalents by providing detailed zip
 #   entry data and raw file access.
-#   Open-sourced as part of Bazel.
 package(default_visibility = ["//src:__subpackages__"])
 
+package_group(
+    name = "packages",
+    packages = [
+        "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
+        "//src/java_tools/singlejar/javatests/com/google/devtools/build/zip",
+    ],
+)
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["*.java"]) + ["BUILD"],
+)
+
 # Necessary for the bootstrap compilation.
 filegroup(
     name = "java-srcs",
@@ -16,9 +28,3 @@ java_library(
     srcs = glob(["*.java"]),
     deps = ["//third_party:jsr305"],
 )
-
-filegroup(
-    name = "srcs",
-    testonly = 0,  # All srcs should be not test only, overwrite package default.
-    srcs = glob(["**"]),
-)
diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD
new file mode 100644
index 0000000000..e8ac3738a7
--- /dev/null
+++ b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD
@@ -0,0 +1,30 @@
+# Description:
+#   Tests for SingleJar
+package(default_visibility = ["//src:__subpackages__"])
+
+java_library(
+    name = "libSingleJarTesting",
+    testonly = 1,
+    srcs = glob(["*.java"]),
+    deps = [
+        "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:libSingleJar",
+        "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:libSingleJarMain",
+        "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
+        "//src/test/java/com/google/devtools/build/lib:testutil",
+        "//third_party:guava",
+        "//third_party:jsr305",
+        "//third_party:junit4",
+        "//third_party:truth",
+    ],
+)
+
+java_test(
+    name = "SingleJarTests",
+    test_class = "com.google.devtools.build.singlejar.SingleJarTests",
+    runtime_deps = [":libSingleJarTesting"],
+)
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["*.java"]) + ["BUILD"],
+)
diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD b/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD
new file mode 100644
index 0000000000..db24dd5838
--- /dev/null
+++ b/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD
@@ -0,0 +1,28 @@
+# Description:
+#   Tests for Zip
+package(default_visibility = ["//src:__subpackages__"])
+
+java_library(
+    name = "zip_tests",
+    testonly = 1,
+    srcs = glob(["*.java"]),
+    deps = [
+        "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
+        "//src/test/java/com/google/devtools/build/lib:testutil",
+        "//third_party:guava",
+        "//third_party:guava-testlib",
+        "//third_party:junit4",
+        "//third_party:truth",
+    ],
+)
+
+java_test(
+    name = "ZipTests",
+    test_class = "com.google.devtools.build.zip.ZipTests",
+    runtime_deps = [":zip_tests"],
+)
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["*.java"]) + ["BUILD"],
+)