BEGIN_PUBLIC

Migrate bazel/src/tools/android/java/com/google/devtools/build/android to rules_android END_PUBLIC RELNOTES: Moved all Bazel Android tool and action code to rules_android. PiperOrigin-RevId: 681554358 Change-Id: I54cdea4f803062feb5f6e0164064839c09db1d39
iancha1992 · Oct 2, 2024 · 337f597 · 337f597
1 parent 2642004
commit 337f597
Show file tree

Hide file tree

Showing 365 changed files with 9 additions and 58,378 deletions.
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
@@ -31,7 +31,6 @@ tasks:
       - "//src/tools/singlejar/..."
       - "//src/tools/workspacelog/..."
       - "//third_party/ijar/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/compliance/..."
       - "//tools/python/..."
@@ -42,7 +41,6 @@ tasks:
       - "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"
       - "-//src/test/shell/bazel:bazel_coverage_sh_test"
       # Disable some Android tests since we are moving Android rules out of the Bazel repo.
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       - "-//src/test/shell/bazel:bazel_android_tools_test"
     include_json_profile:
       - build
@@ -83,12 +81,10 @@ tasks:
       - "//src/tools/singlejar/..."
       - "//src/tools/workspacelog/..."
       - "//third_party/ijar/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
       # Disable some Android tests since we are moving Android rules out of the Bazel repo.
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       - "-//src/test/shell/bazel:bazel_android_tools_test"
     include_json_profile:
       - build
@@ -139,12 +135,10 @@ tasks:
       - "//src/tools/singlejar/..."
       - "//src/tools/workspacelog/..."
       - "//third_party/ijar/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
       # Disable some Android tests since we are moving Android rules out of the Bazel repo.
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       - "-//src/test/shell/bazel:bazel_android_tools_test"
     include_json_profile:
       - build
@@ -174,7 +168,6 @@ tasks:
       - "//src/tools/singlejar/..."
       - "//src/tools/workspacelog/..."
       - "//third_party/ijar/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
@@ -184,9 +177,6 @@ tasks:
       # https://github.com/bazelbuild/bazel/issues/17410
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
       # Disable android tests since we are moving Android rules out of the Bazel repo.
-      - "-//src/tools/android/java/com/google/devtools/build/android/..."
-      - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       # ServerTests frequently runs into deadlocks on Intel Macs
       - "-//src/test/java/com/google/devtools/build/lib/server:ServerTests"
       # Add back a few Apple specific tests
@@ -220,17 +210,12 @@ tasks:
       - "//src/tools/singlejar/..."
       - "//src/tools/workspacelog/..."
       - "//third_party/ijar/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
       # https://github.com/bazelbuild/bazel/issues/17410
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
       # Disable android tests since we are moving Android rules out of Bazel repo.
-      - "-//src/test/shell/bazel/android/..."
-      - "-//src/tools/android/java/com/google/devtools/build/android/..."
-      - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       - "-//src/test/shell/bazel:bazel_android_tools_test"
     include_json_profile:
       - build
@@ -252,7 +237,6 @@ tasks:
       - "//src:embedded_tools_size_test"
       - "//src/main/starlark/tests/builtins_bzl/..."
       - "//src/test/cpp/..."
-      - "//src/test/java/com/google/devtools/build/android/..."
       - "//src/test/java/com/google/devtools/build/lib/..."
       - "//src/test/java/com/google/devtools/build/skyframe/..."
       - "//src/test/java/com/google/devtools/common/options/..."
@@ -264,7 +248,6 @@ tasks:
       - "//src/tools/one_version/..."
       - "//src/tools/singlejar/..."
       - "//third_party/def_parser/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/bash/..."
       - "//tools/build_defs/..."
@@ -275,7 +258,6 @@ tasks:
       - "//tools/test/..."
       # Re-enable the following tests on Windows:
       # https://github.com/bazelbuild/bazel/issues/4292
-      - "-//src/test/java/com/google/devtools/build/android/r8/..."
       - "-//src/test/java/com/google/devtools/build/lib/query2/cquery/..."
       - "-//src/test/java/com/google/devtools/build/lib/query2/engine/..."
       - "-//src/test/java/com/google/devtools/build/lib/versioning/..."
@@ -336,7 +318,6 @@ tasks:
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      - "//tools/android/..."
       # See https://github.com/bazelbuild/bazel/issues/8033
       - "-//src/tools/singlejar:output_jar_simple_test"
       - "-//src/test/shell/bazel:external_integration_test"
@@ -354,7 +335,6 @@ tasks:
       - "-//src/test/shell/bazel:starlark_repository_test"
       - "-//src/test/shell/bazel:verify_workspace"
       # Disable some Android tests since we are moving Android rules out of the Bazel repo.
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       - "-//src/test/shell/bazel:bazel_android_tools_test"
     include_json_profile:
       - build

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -32,7 +32,6 @@ tasks:
       - "//src/tools/singlejar/..."
       - "//src/tools/workspacelog/..."
       - "//third_party/ijar/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/compliance/..."
       - "//tools/python/..."
@@ -43,7 +42,6 @@ tasks:
       - "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"
       - "-//src/test/shell/bazel:bazel_coverage_sh_test"
       # Disable some Android tests since we are moving Android rules out of the Bazel repo.
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       - "-//src/test/shell/bazel:bazel_android_tools_test"
     include_json_profile:
       - build
@@ -85,12 +83,10 @@ tasks:
       - "//src/tools/singlejar/..."
       - "//src/tools/workspacelog/..."
       - "//third_party/ijar/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
       # Disable some Android tests since we are moving Android rules out of the Bazel repo.
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       - "-//src/test/shell/bazel:bazel_android_tools_test"
     include_json_profile:
       - build
@@ -142,12 +138,10 @@ tasks:
       - "//src/tools/singlejar/..."
       - "//src/tools/workspacelog/..."
       - "//third_party/ijar/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
       # Disable some Android tests since we are moving Android rules out of the Bazel repo.
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       - "-//src/test/shell/bazel:bazel_android_tools_test"
     include_json_profile:
       - build
@@ -177,7 +171,6 @@ tasks:
       - "//src/tools/singlejar/..."
       - "//src/tools/workspacelog/..."
       - "//third_party/ijar/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
@@ -187,9 +180,6 @@ tasks:
       # https://github.com/bazelbuild/bazel/issues/17410
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
       # Disable android tests since we are moving Android rules out of the Bazel repo.
-      - "-//src/tools/android/java/com/google/devtools/build/android/..."
-      - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       # ServerTests frequently runs into deadlocks on Intel Macs
       - "-//src/test/java/com/google/devtools/build/lib/server:ServerTests"
       # Add back a few Apple specific tests
@@ -220,17 +210,12 @@ tasks:
       - "//src/tools/singlejar/..."
       - "//src/tools/workspacelog/..."
       - "//third_party/ijar/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
       # https://github.com/bazelbuild/bazel/issues/17410
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
       # Disable android tests since we are moving Android rules out of Bazel repo.
-      - "-//src/test/shell/bazel/android/..."
-      - "-//src/tools/android/java/com/google/devtools/build/android/..."
-      - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       - "-//src/test/shell/bazel:bazel_android_tools_test"
       # https://github.com/bazelbuild/bazel/issues/23726
       - "-//src/test/shell/bazel:bazel_determinism_test"
@@ -263,7 +248,6 @@ tasks:
       - "//src:embedded_tools_size_test"
       - "//src/main/starlark/tests/builtins_bzl/..."
       - "//src/test/cpp/..."
-      - "//src/test/java/com/google/devtools/build/android/..."
       - "//src/test/java/com/google/devtools/build/lib/..."
       - "//src/test/java/com/google/devtools/build/skyframe/..."
       - "//src/test/java/com/google/devtools/common/options/..."
@@ -275,7 +259,6 @@ tasks:
       - "//src/tools/one_version/..."
       - "//src/tools/singlejar/..."
       - "//third_party/def_parser/..."
-      - "//tools/android/..."
       - "//tools/aquery_differ/..."
       - "//tools/bash/..."
       - "//tools/build_defs/..."
@@ -286,7 +269,6 @@ tasks:
       - "//tools/test/..."
       # Re-enable the following tests on Windows:
       # https://github.com/bazelbuild/bazel/issues/4292
-      - "-//src/test/java/com/google/devtools/build/android/r8/..."
       - "-//src/test/java/com/google/devtools/build/lib/query2/cquery/..."
       - "-//src/test/java/com/google/devtools/build/lib/query2/engine/..."
       - "-//src/test/java/com/google/devtools/build/lib/versioning/..."
@@ -347,7 +329,6 @@ tasks:
       - "//tools/aquery_differ/..."
       - "//tools/python/..."
       - "//tools/bash/..."
-      - "//tools/android/..."
       # See https://github.com/bazelbuild/bazel/issues/8033
       - "-//src/tools/singlejar:output_jar_simple_test"
       - "-//src/test/shell/bazel:external_integration_test"
@@ -368,7 +349,6 @@ tasks:
       # https://github.com/bazelbuild/continuous-integration/issues/1631
       - "-//src/test/shell/bazel:bazel_sandboxing_networking_test"
       # Disable some Android tests since we are moving Android rules out of the Bazel repo.
-      - "-//src/test/java/com/google/devtools/build/android/r8:AllTests"
       - "-//src/test/shell/bazel:bazel_android_tools_test"
     include_json_profile:
       - build

diff --git a/src/BUILD b/src/BUILD
@@ -97,7 +97,6 @@ JAVA_TOOLS = [
                "//src/main/cpp/util:embedded_tools",
                "//src/main/native:embedded_tools",
                "//src/main/protobuf:srcs",
-               "//src/tools/android/java/com/google/devtools/build/android:embedded_tools",
                "//src/tools/launcher:srcs",
                "//third_party:gpl-srcs",
                "//third_party/def_parser:srcs",
@@ -358,7 +357,6 @@ filegroup(
         "//src/main/tools:srcs",
         "//src/test/cpp:srcs",
         "//src/test/gen:srcs",
-        "//src/test/java/com/google/devtools/build/android:srcs",
         "//src/test/java/com/google/devtools/build/docgen:srcs",
         "//src/test/java/com/google/devtools/build/lib:srcs",
         "//src/test/java/com/google/devtools/build/lib/shell:srcs",
@@ -374,7 +372,6 @@ filegroup(
         "//src/test/tools:srcs",
         "//src/test/tools/bzlmod:srcs",
         "//src/tools/android:srcs",
-        "//src/tools/android/java/com/google/devtools/build/android:srcs",
         "//src/tools/bzlmod:srcs",
         "//src/tools/diskcache:srcs",
         "//src/tools/execlog:srcs",

diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD
@@ -31,6 +31,9 @@ java_library(
         "//src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar:__pkg__",
         "//src/test/java/com/google/devtools/build/android:__pkg__",
         "//src/tools/android/java/com/google/devtools/build/android:__pkg__",
+        "//third_party/bazel_rules/rules_android/src/tools/java/com/google/devtools/build/android:__pkg__",
+        "//third_party/bazel_rules/rules_android/src/tools/javatests/com/google/devtools/build/android:__pkg__",
+        "//third_party/bazel_rules/rules_android/src/tools/javatests/com/google/devtools/build/android/r8:__pkg__",
     ],
     deps = [
         "//src/java_tools/singlejar/java/com/google/devtools/build/zip",