Skip to content

Commit 70facd3

Browse files
ahumeskykeertkiancha1992
authored
[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 #16368 * Update Android rules to 0.27.2 to include #18909 --------- Co-authored-by: keertk <[email protected]> Co-authored-by: Ian (Hee) Cha <[email protected]>
1 parent e8ac967 commit 70facd3

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

WORKSPACE

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,19 @@ distdir_tar(
124124
name = "additional_distfiles",
125125
# Keep in sync with the archives fetched as part of building bazel.
126126
archives = [
127-
"android_tools_pkg-0.27.0.tar.gz",
127+
"android_tools_pkg-0.27.2.tar",
128128
# for android_gmaven_r8
129129
"r8-8.0.40.jar",
130130
],
131131
dirname = "derived/distdir",
132132
dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "additional_distfiles" in attrs["used_in"]},
133133
sha256 = {
134-
"android_tools_pkg-0.27.0.tar.gz": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d",
134+
"android_tools_pkg-0.27.2.tar": "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b",
135135
"r8-8.0.40.jar": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
136136
},
137137
urls = {
138-
"android_tools_pkg-0.27.0.tar.gz": [
139-
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz",
138+
"android_tools_pkg-0.27.2.tar": [
139+
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar",
140140
],
141141
"r8-8.0.40.jar": [
142142
"https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
@@ -359,16 +359,16 @@ dist_http_archive(
359359
distdir_tar(
360360
name = "test_WORKSPACE_files",
361361
archives = [
362-
"android_tools_pkg-0.27.0.tar.gz",
362+
"android_tools_pkg-0.27.2.tar",
363363
],
364364
dirname = "test_WORKSPACE/distdir",
365365
dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "test_WORKSPACE_files" in attrs["used_in"]},
366366
sha256 = {
367-
"android_tools_pkg-0.27.0.tar.gz": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d",
367+
"android_tools_pkg-0.27.2.tar": "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b",
368368
},
369369
urls = {
370-
"android_tools_pkg-0.27.0.tar.gz": [
371-
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz",
370+
"android_tools_pkg-0.27.2.tar": [
371+
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar",
372372
],
373373
},
374374
)
@@ -404,8 +404,8 @@ http_archive(
404404
name = "android_tools_for_testing",
405405
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
406406
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
407-
sha256 = "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
408-
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz",
407+
sha256 = "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
408+
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar",
409409
)
410410

411411
# This is here to override the android_gmaven_r8 rule from

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
55
maybe(
66
http_archive,
77
name = "android_tools",
8-
sha256 = "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
9-
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz",
8+
sha256 = "5d0f140125afba82603ccd5050c78dd2e2863ca992a17f43f6df9a9119ffcb9b", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
9+
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.2.tar",
1010
)
1111

1212
# This must be kept in sync with the top-level WORKSPACE file.

src/test/shell/bazel/android/BUILD

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,6 @@ android_sh_test(
238238
name = "DexFileSplitter_synthetic_classes_test",
239239
size = "medium",
240240
srcs = ["DexFileSplitter_synthetic_classes_test.sh"],
241-
# Fixes to DexMapper are not released yet.
242-
create_test_with_released_tools = False,
243241
data = [
244242
":android_helper",
245243
"//external:android_sdk_for_testing",

0 commit comments

Comments
 (0)