Add a separate BUILD file for singlejar zip library.
--
MOS_MIGRATED_REVID=108622328
diff --git a/src/java_tools/singlejar/BUILD b/src/java_tools/singlejar/BUILD
index 3c303f3..215f475 100644
--- a/src/java_tools/singlejar/BUILD
+++ b/src/java_tools/singlejar/BUILD
@@ -2,7 +2,7 @@
filegroup(
name = "srcs",
- srcs = glob(["**"]),
+ srcs = glob(["**"]) + ["//src/java_tools/singlejar/java/com/google/devtools/build/zip:srcs"],
visibility = ["//src/test/shell/bazel:__pkg__"],
)
@@ -10,7 +10,7 @@
name = "libSingleJar",
srcs = glob(["java/**/singlejar/**/*.java"]),
deps = [
- ":zip",
+ "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
"//src/main/java/com/google/devtools/build/lib:shell",
"//third_party:jsr305",
],
@@ -28,7 +28,7 @@
args = ["com.google.devtools.build.singlejar.SingleJarTests"],
deps = [
":libSingleJar",
- ":zip",
+ "//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",
@@ -38,14 +38,6 @@
],
)
-java_library(
- name = "zip",
- srcs = glob(["java/**/zip/**/*.java"]),
- deps = [
- "//third_party:jsr305",
- ],
-)
-
java_test(
name = "zipTests",
size = "enormous",
@@ -53,7 +45,7 @@
args = ["com.google.devtools.build.zip.ZipTests"],
tags = ["zip"],
deps = [
- ":zip",
+ "//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",
@@ -76,7 +68,7 @@
bootstrap_java_binary(
name = "bootstrap",
- srcs = glob(["java/**/*.java"]),
+ srcs = glob(["java/**/*.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 = [
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
new file mode 100644
index 0000000..66002cb
--- /dev/null
+++ b/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD
@@ -0,0 +1,23 @@
+# Description:
+# 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__"])
+
+# Necessary for the bootstrap compilation.
+filegroup(
+ name = "java-srcs",
+ srcs = glob(["*.java"]),
+)
+
+java_library(
+ name = "zip",
+ srcs = glob(["*.java"]),
+ deps = ["//third_party:jsr305"],
+)
+
+filegroup(
+ name = "srcs",
+ srcs = glob(["**"]),
+)
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index 5d814f8..742b3a8 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -113,7 +113,7 @@
":unix",
":util",
":vfs",
- "//src/java_tools/singlejar:zip",
+ "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/bazel/dash",
"//src/main/java/com/google/devtools/build/lib/query2",
diff --git a/src/objc_tools/bundlemerge/BUILD b/src/objc_tools/bundlemerge/BUILD
index c746692..e5c0c47 100644
--- a/src/objc_tools/bundlemerge/BUILD
+++ b/src/objc_tools/bundlemerge/BUILD
@@ -18,7 +18,7 @@
srcs = glob(["java/**/BundleMerging.java"]),
deps = [
"//src/java_tools/singlejar:libSingleJar",
- "//src/java_tools/singlejar:zip",
+ "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
"//src/main/protobuf:bundlemerge_proto",
"//src/objc_tools/plmerge:plmerge_lib",
"//src/tools/xcode-common/java/com/google/devtools/build/xcode/common",
diff --git a/src/tools/xcode-common/java/com/google/devtools/build/xcode/zip/BUILD b/src/tools/xcode-common/java/com/google/devtools/build/xcode/zip/BUILD
index d3d30b7..bb25596 100644
--- a/src/tools/xcode-common/java/com/google/devtools/build/xcode/zip/BUILD
+++ b/src/tools/xcode-common/java/com/google/devtools/build/xcode/zip/BUILD
@@ -13,7 +13,7 @@
],
deps = [
"//src/java_tools/singlejar:libSingleJar",
- "//src/java_tools/singlejar:zip",
+ "//src/java_tools/singlejar/java/com/google/devtools/build/zip",
"//src/tools/xcode-common/java/com/google/devtools/build/xcode/util",
"//third_party:guava",
],
