Pull in the right deps into the embedded tools.
Fixes #5378.
$ find $(bazel-bin/src/bazel info install_base) -type f | wc -l
508
$ stat -c %s bazel-bin/src/bazel
115014201
The number of embedded files is now 508 and the binary size is ~115Mb.
RELNOTES: None.
Change-Id: I75e43a959e1201cc36718a9acd0af96e9506c7d4
PiperOrigin-RevId: 200539940
diff --git a/tools/BUILD b/tools/BUILD
index 84e96b1..6192571 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -67,12 +67,11 @@
"//tools/python:embedded_tools",
"//tools/runfiles:embedded_tools",
"//tools/test:srcs",
- "//tools/test/LcovMerger/java/com/google/devtools/lcovmerger:srcs",
+ "//tools/test/LcovMerger/java/com/google/devtools/lcovmerger:embedded_tools",
"//tools/osx/crosstool:srcs",
"//tools/osx:srcs",
"//tools/sh:embedded_tools",
"//tools/whitelists:srcs",
"//tools/zip:srcs",
- "//third_party:srcs",
],
)
diff --git a/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/BUILD b/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/BUILD
index b7d4d7b..38e0816 100644
--- a/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/BUILD
+++ b/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/BUILD
@@ -6,6 +6,22 @@
licenses(["notice"]) # Apache 2.0
+java_binary(
+ name = "all_lcov_merger_tools",
+ visibility = ["//visibility:public"],
+ runtime_deps = [":lcov_merger_lib"],
+)
+
+java_library(
+ name = "lcov_merger_lib",
+ srcs = glob(["*.java"]),
+ deps = [
+ "//third_party:auto_value",
+ "//third_party:guava",
+ "//third_party:jsr305",
+ ],
+)
+
java_library(
name = "BranchCoverage",
srcs = ["BranchCoverage.java"],
@@ -83,24 +99,17 @@
],
)
-java_binary(
- name = "Main",
- srcs = ["Main.java"],
- main_class = "com.google.devtools.lcovmerger.Main",
- visibility = ["//visibility:public"],
- deps = [
- ":Coverage",
- ":LcovConstants",
- ":LcovParser",
- ":LcovPrinter",
- ":MainLibrary",
- ":SourceFileCoverage",
- "//third_party:guava",
- ],
-)
-
filegroup(
name = "srcs",
srcs = glob(["**"]),
visibility = ["//visibility:public"],
)
+
+filegroup(
+ name = "embedded_tools",
+ srcs = [
+ "BUILD.tools",
+ ":all_lcov_merger_tools_deploy.jar",
+ ],
+ visibility = ["//visibility:public"],
+)
diff --git a/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/BUILD.tools b/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/BUILD.tools
new file mode 100644
index 0000000..37cf8e4
--- /dev/null
+++ b/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/BUILD.tools
@@ -0,0 +1,12 @@
+package(default_visibility = ["//visibility:public"])
+
+java_import(
+ name = "all_lcov_merger_lib",
+ jars = ["all_lcov_merger_tools_deploy.jar"],
+)
+
+java_binary(
+ name = "Main",
+ main_class = "com.google.devtools.lcovmerger.Main",
+ runtime_deps = [":all_lcov_merger_lib"],
+)
