Merge "Revert "Remove non-public API from apksig Bazel target""
diff --git a/BUILD b/BUILD
index 5fc0605..915d368 100644
--- a/BUILD
+++ b/BUILD
@@ -2,23 +2,12 @@
 
 licenses(["notice"])  # Apache License 2.0
 
-# Public API of the apksig library. Clients (other than this package and its
-# subpackages) depend on this via the publicly visible //third_party/java/apksig
 java_library(
     name = "apksig",
-    srcs = glob(
-        ["src/main/java/com/android/apksig/**/*.java"],
-        exclude = ["src/main/java/com/android/apksig/internal/**/*.java"],
-    ),
+    srcs = glob([
+        "src/main/java/**/*.java",
+    ]),
     visibility = ["//visibility:public"],
-    deps = [":apksig-all"],
-)
-
-# All of apksig library, including private API which clients are not supposed
-# to depend on
-java_library(
-    name = "apksig-all",
-    srcs = glob(["src/main/java/**/*.java"]),
 )
 
 java_binary(
@@ -43,5 +32,5 @@
         "src/test/resources/**/*",
     ]),
     test_class = "com.android.apksig.AllTests",
-    deps = [":apksig-all"],
+    deps = [":apksig"],
 )