Automated rollback of commit 7b540204eea9b003e19efe917abacf67270f5e02.

*** Reason for rollback ***

Breaks rapid candidate creation

*** Original change description ***

This and further changes may contain minor modifications to BUILD files that don't serve any apparent purpose. The reason for these changes is that we're switching from checked-in BUILD files to generated BUILD files, and there may be small differences between these files.

RELNOTES: None
PiperOrigin-RevId: 178120126

2 files changed, 23 insertions, 37 deletions

diff --git a/tools/android/BUILD b/tools/android/BUILD
index d53612a8ca..2144b0baec 100644
--- a/tools/android/BUILD
+++ b/tools/android/BUILD
@@ -1,9 +1,4 @@
-package(default_visibility = ["//tools:__subpackages__"])
-
-filegroup(
-    name = "srcs",
-    srcs = glob(["**"]) + ["//tools/android/emulator:srcs"],
-)
+package(default_visibility = ["//tools:__pkg__"])
 
 py_binary(
     name = "merge_manifests",
@@ -29,7 +24,9 @@ py_binary(
 
 sh_test(
     name = "build_incremental_dexmanifest_test",
-    srcs = ["build_incremental_dexmanifest_test.sh"],
+    srcs = [
+        "build_incremental_dexmanifest_test.sh",
+    ],
     args = ["$(location //tools/zip:zipper)"],
     data = [
         ":build_incremental_dexmanifest",
@@ -74,9 +71,7 @@ py_test(
 py_binary(
     name = "strip_resources",
     srcs = ["strip_resources.py"],
-    deps = [
-        "//third_party/py/gflags",
-    ],
+    deps = ["//third_party/py/gflags"],
 )
 
 sh_test(
@@ -91,7 +86,9 @@ sh_test(
 
 py_binary(
     name = "aar_native_libs_zip_creator",
-    srcs = ["aar_native_libs_zip_creator.py"],
+    srcs = [
+        "aar_native_libs_zip_creator.py",
+    ],
     deps = [
         ":junction_lib",
         "//third_party/py/gflags",
@@ -100,8 +97,12 @@ py_binary(
 
 py_test(
     name = "aar_native_libs_zip_creator_test",
-    srcs = ["aar_native_libs_zip_creator_test.py"],
-    deps = [":aar_native_libs_zip_creator"],
+    srcs = [
+        "aar_native_libs_zip_creator_test.py",
+    ],
+    deps = [
+        ":aar_native_libs_zip_creator",
+    ],
 )
 
 py_binary(
@@ -120,22 +121,6 @@ py_test(
     ],
 )
 
-sh_binary(
-    name = "zip_manifest_creator",
-    srcs = ["zip_manifest_creator.sh"],
-    data = ["//tools/zip:zipper"],
-)
-
-sh_test(
-    name = "zip_manifest_creator_test",
-    srcs = ["zip_manifest_creator_test.sh"],
-    args = ["$(location //tools/zip:zipper)"],
-    data = [
-        ":zip_manifest_creator",
-        "//tools/zip:zipper",
-    ],
-)
-
 py_binary(
     name = "aar_embedded_jars_extractor",
     srcs = ["aar_embedded_jars_extractor.py"],
@@ -148,10 +133,7 @@ py_binary(
 py_test(
     name = "aar_embedded_jars_extractor_test",
     srcs = ["aar_embedded_jars_extractor_test.py"],
-    deps = [
-        ":aar_embedded_jars_extractor",
-        "//third_party/py/gflags",
-    ],
+    deps = [":aar_embedded_jars_extractor"],
 )
 
 py_binary(
@@ -177,14 +159,13 @@ py_binary(
 py_test(
     name = "resource_extractor_test",
     srcs = ["resource_extractor_test.py"],
-    deps = [
-        ":resource_extractor",
-    ],
+    deps = [":resource_extractor"],
 )
 
 py_library(
     name = "junction_lib",
     srcs = ["junction.py"],
+    visibility = ["//visibility:private"],
 )
 
 py_test(
@@ -206,6 +187,11 @@ py_test(
 )
 
 filegroup(
+    name = "srcs",
+    srcs = glob(["**"]) + ["//tools/android/emulator:srcs"],
+)
+
+filegroup(
     name = "embedded_tools",
     srcs = glob(
         ["*"],
diff --git a/tools/android/emulator/BUILD b/tools/android/emulator/BUILD
index 0c7dc31352..c21c9c5154 100644
--- a/tools/android/emulator/BUILD
+++ b/tools/android/emulator/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ["//tools:__subpackages__"])
+package(default_visibility = ["//tools/android:__pkg__"])
 
 filegroup(
     name = "srcs",