diff --git a/third_party/java/jacoco/BUILD b/third_party/java/jacoco/BUILD index 1002c63c2c0575..e03d01997e4f4e 100644 --- a/third_party/java/jacoco/BUILD +++ b/third_party/java/jacoco/BUILD @@ -4,6 +4,7 @@ # http://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/0.8.3/jacoco-0.8.3.zip load("//tools/distributions:distribution_rules.bzl", "distrib_jar_filegroup", "distrib_java_import") +load("//src:release_archive.bzl", "release_archive") licenses(["reciprocal"]) # EPL 1.0 (Eclipse Public License) @@ -18,17 +19,15 @@ filegroup( srcs = glob(["**"]), ) -genrule( +release_archive( name = "jacoco_jars_zip", srcs = glob(["*.jar"]) + ["LICENSE"] + [ "//third_party:asm", "//third_party:asm-commons", "//third_party:asm-tree", ], - outs = ["jacoco_jars.zip"], - cmd = "$(location //src:zip_files) third_party/java/jacoco $@ $(SRCS)", - output_to_bindir = 1, - tools = ["//src:zip_files"], + package_dir = "java_tools/third_party/java/jacoco", + visibility = ["//visibility:public"], ) filegroup( diff --git a/third_party/java/proguard/BUILD b/third_party/java/proguard/BUILD index 2d36e95abd7c28..0c66a6fd77f58a 100644 --- a/third_party/java/proguard/BUILD +++ b/third_party/java/proguard/BUILD @@ -1,5 +1,7 @@ licenses(["restricted"]) # GNU GPL v2 +load("//src:release_archive.bzl", "release_archive") + filegroup( name = "srcs", srcs = glob(["**"]), @@ -19,14 +21,12 @@ filegroup( visibility = ["//src:__pkg__"], ) -genrule( +release_archive( name = "proguard_zip", srcs = [ "proguard5.3.3/docs/GPL.html", "proguard5.3.3/lib/proguard.jar", ], - outs = ["proguard.zip"], - cmd = "$(location //src:zip_files) third_party/java/proguard $@ $(SRCS)", - tools = ["//src:zip_files"], + package_dir = "java_tools/third_party/java/proguard", visibility = ["//src:__pkg__"], )