Automated rollback of commit 9a1d428.

*** Reason for rollback ***

Downstream projects on bazelci have been updated to not hardcode the buildtools versions: bazelbuild#13409 (comment)

*** Original change description ***

Automated rollback of commit b6f87f1.

*** Reason for rollback ***

Breaks downstream bazel projects because AAPT2 needs to be updated in the build images:
https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/2010#2595dff6-44ac-4996-9b38-cdacf2842215

*** Original change description ***

Updates Android remote tools to 0.23.0 to include Update remote android tools to include c3edf13.

RELNOTES: None.
PiperOrigin-RevId: 377971964

WORKSPACE

@@ -156,7 +156,7 @@ distdir_tar(
  "1.25.0.zip",
  # rules_nodejs
  "rules_nodejs-2.2.2.tar.gz",
- "android_tools_pkg-0.21.0.tar.gz",
+ "android_tools_pkg-0.23.0.tar.gz",
  # bazelbuild/bazel-skylib
  "bazel-skylib-1.0.3.tar.gz",
  # bazelbuild/platforms
@@ -197,7 +197,7 @@ distdir_tar(
  "1.25.0.zip": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
  # rules_nodejs
  "rules_nodejs-2.2.2.tar.gz": "f2194102720e662dbf193546585d705e645314319554c6ce7e47d8b59f459e9c",
- "android_tools_pkg-0.21.0.tar.gz": "a4a17c811de5ca0df81b93ccc34e4b8494da9176bda4c85512083c2172494190",
+ "android_tools_pkg-0.23.0.tar.gz": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
  # bazelbuild/bazel-skylib
  "bazel-skylib-1.0.3.tar.gz": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
  # bazelbuild/platforms
@@ -254,8 +254,8 @@ distdir_tar(
  "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz",
  "https://github.com/bazelbuild/rules_nodejs/releases/download/2.2.2/rules_nodejs-2.2.2.tar.gz",
  ],
- "android_tools_pkg-0.21.0.tar.gz": [
- "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.21.0.tar.gz",
+ "android_tools_pkg-0.23.0.tar.gz": [
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz",
  ],
  # bazelbuild/bazel-skylib
  "bazel-skylib-1.0.3.tar.gz": [
@@ -578,7 +578,7 @@ distdir_tar(
  "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz",
  "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
  "zulu11.37.17-ca-jdk11.0.6-win_x64.zip",
- "android_tools_pkg-0.21.0.tar.gz",
+ "android_tools_pkg-0.23.0.tar.gz",
  # bazelbuild/bazel-skylib
  "bazel-skylib-1.0.3.tar.gz",
  # bazelbuild/platforms
@@ -613,7 +613,7 @@ distdir_tar(
  "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
  "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
  "zulu11.37.17-ca-jdk11.0.6-win_x64.zip": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
- "android_tools_pkg-0.21.0.tar.gz": "a4a17c811de5ca0df81b93ccc34e4b8494da9176bda4c85512083c2172494190",
+ "android_tools_pkg-0.23.0.tar.gz": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
  # bazelbuild/bazel-skylib
  "bazel-skylib-1.0.3.tar.gz": "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
  # bazelbuild/platforms
@@ -647,8 +647,8 @@ distdir_tar(
  "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"],
  "zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz": ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz"],
  "zulu11.37.17-ca-jdk11.0.6-win_x64.zip": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"],
- "android_tools_pkg-0.21.0.tar.gz": [
- "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.21.0.tar.gz",
+ "android_tools_pkg-0.23.0.tar.gz": [
+ "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz",
  ],
  # bazelbuild/bazel-skylib
  "bazel-skylib-1.0.3.tar.gz": [
@@ -778,8 +778,8 @@ http_archive(
  name = "android_tools_for_testing",
  patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
  patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
- sha256 = "a4a17c811de5ca0df81b93ccc34e4b8494da9176bda4c85512083c2172494190", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
- url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.21.0.tar.gz",
+ sha256 = "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
+ url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz",
 )
 
 # This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/coverage.WORKSPACE.

src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE

@@ -3,6 +3,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # This must be kept in sync with the top-level WORKSPACE file.
 http_archive(
  name = "android_tools",
- sha256 = "a4a17c811de5ca0df81b93ccc34e4b8494da9176bda4c85512083c2172494190",
- url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.21.0.tar.gz",
+ sha256 = "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
+ url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz",
 )