1 files changed, 24 insertions, 15 deletions
diff --git a/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/BUILD b/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/BUILD
index b7d4d7b08c..38e0816a95 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 @@ package(
 
 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_library(
     ],
 )
 
-java_binary(
-    name = "Main",
-    srcs = ["Main.java"],
-    main_class = "com.google.devtools.lcovmerger.Main",
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
     visibility = ["//visibility:public"],
-    deps = [
-        ":Coverage",
-        ":LcovConstants",
-        ":LcovParser",
-        ":LcovPrinter",
-        ":MainLibrary",
-        ":SourceFileCoverage",
-        "//third_party:guava",
-    ],
 )
 
 filegroup(
-    name = "srcs",
-    srcs = glob(["**"]),
+    name = "embedded_tools",
+    srcs = [
+        "BUILD.tools",
+        ":all_lcov_merger_tools_deploy.jar",
+    ],
     visibility = ["//visibility:public"],
 )