From 70facd3ec01897012cc308fef1f4b70a9142531d Mon Sep 17 00:00:00 2001 From: Alex Humesky Date: Wed, 12 Jul 2023 18:11:21 -0400 Subject: [PATCH] [6.3.0] Update Android tools to 0.27.2 for fixes to DexMapper for https://gith... (#18891) * Update Android tools to 0.27.1 for fixes to DexMapper for https://github.com/bazelbuild/bazel/issues/16368 * Update Android rules to 0.27.2 to include https://github.com/bazelbuild/bazel/pull/18909 --------- Co-authored-by: keertk Co-authored-by: Ian (Hee) Cha --- WORKSPACE | 20 +++++++++---------- .../android/android_remote_tools.WORKSPACE | 4 ++-- src/test/shell/bazel/android/BUILD | 2 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6b142957a35fa3..f6e0a3352d06f6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -124,19 +124,19 @@ distdir_tar( name = "additional_distfiles", # Keep in sync with the archives fetched as part of building bazel. archives = [ - "android_tools_pkg-0.27.0.tar.gz", + "android_tools_pkg-0.27.2.tar", # for android_gmaven_r8 "r8-8.0.40.jar", ], dirname = "derived/distdir", dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "additional_distfiles" in attrs["used_in"]}, sha256 = { - "android_tools_pkg-0.27.0.tar.gz": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", + "android_tools_pkg-0.27.2.tar": "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b", "r8-8.0.40.jar": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702", }, urls = { - "android_tools_pkg-0.27.0.tar.gz": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz", + "android_tools_pkg-0.27.2.tar": [ + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar", ], "r8-8.0.40.jar": [ "https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar", @@ -359,16 +359,16 @@ dist_http_archive( distdir_tar( name = "test_WORKSPACE_files", archives = [ - "android_tools_pkg-0.27.0.tar.gz", + "android_tools_pkg-0.27.2.tar", ], dirname = "test_WORKSPACE/distdir", dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "test_WORKSPACE_files" in attrs["used_in"]}, sha256 = { - "android_tools_pkg-0.27.0.tar.gz": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", + "android_tools_pkg-0.27.2.tar": "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b", }, urls = { - "android_tools_pkg-0.27.0.tar.gz": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz", + "android_tools_pkg-0.27.2.tar": [ + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar", ], }, ) @@ -404,8 +404,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 = "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER - url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz", + sha256 = "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER + url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar", ) # This is here to override the android_gmaven_r8 rule from diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE index f567dafd842e48..4e79e0ba1b2ca6 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE @@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") maybe( http_archive, name = "android_tools", - sha256 = "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER - url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz", + sha256 = "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER + url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar", ) # This must be kept in sync with the top-level WORKSPACE file. diff --git a/src/test/shell/bazel/android/BUILD b/src/test/shell/bazel/android/BUILD index 9921da218dd1f7..cc57a0b0b1bb5f 100644 --- a/src/test/shell/bazel/android/BUILD +++ b/src/test/shell/bazel/android/BUILD @@ -238,8 +238,6 @@ android_sh_test( name = "DexFileSplitter_synthetic_classes_test", size = "medium", srcs = ["DexFileSplitter_synthetic_classes_test.sh"], - # Fixes to DexMapper are not released yet. - create_test_with_released_tools = False, data = [ ":android_helper", "//external:android_sdk_for_testing",