Skip to content

Commit 37ceec5

Browse files
ahumeskycopybara-github
authored andcommitted
Update Android tools to 0.29.0 for fixes to DexMapper for #16368
RELNOTES: None PiperOrigin-RevId: 547016404 Change-Id: I7a00a076db4a6d4f5e9e631357fc30696e6038f6
1 parent db7bd58 commit 37ceec5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

WORKSPACE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,19 +125,19 @@ distdir_tar(
125125
name = "additional_distfiles",
126126
# Keep in sync with the archives fetched as part of building bazel.
127127
archives = [
128-
"android_tools_pkg-0.28.0.tar",
128+
"android_tools_pkg-0.29.0.tar",
129129
# for android_gmaven_r8
130130
"r8-8.0.40.jar",
131131
],
132132
dirname = "derived/distdir",
133133
dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "additional_distfiles" in attrs["used_in"]},
134134
sha256 = {
135-
"android_tools_pkg-0.28.0.tar": "db3b02421ae974e0b33573f3e4f658d5f89cc9a0b42baae0ba2ac08e25c0720a",
135+
"android_tools_pkg-0.29.0.tar": "d7223664ca5b0de490f2a918c31f35cdf4f23a1446fe261d7470b8a22bd7bcf1",
136136
"r8-8.0.40.jar": "ab1379835c7d3e5f21f80347c3c81e2f762e0b9b02748ae5232c3afa14adf702",
137137
},
138138
urls = {
139-
"android_tools_pkg-0.28.0.tar": [
140-
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.28.0.tar",
139+
"android_tools_pkg-0.29.0.tar": [
140+
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.29.0.tar",
141141
],
142142
"r8-8.0.40.jar": [
143143
"https://maven.google.com/com/android/tools/r8/8.0.40/r8-8.0.40.jar",
@@ -280,8 +280,8 @@ http_archive(
280280
name = "android_tools_for_testing",
281281
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
282282
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
283-
sha256 = "db3b02421ae974e0b33573f3e4f658d5f89cc9a0b42baae0ba2ac08e25c0720a", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
284-
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.28.0.tar",
283+
sha256 = "d7223664ca5b0de490f2a918c31f35cdf4f23a1446fe261d7470b8a22bd7bcf1", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
284+
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.29.0.tar",
285285
)
286286

287287
# 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 = "db3b02421ae974e0b33573f3e4f658d5f89cc9a0b42baae0ba2ac08e25c0720a", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
9-
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.28.0.tar",
8+
sha256 = "d7223664ca5b0de490f2a918c31f35cdf4f23a1446fe261d7470b8a22bd7bcf1", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
9+
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.29.0.tar",
1010
)
1111

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

0 commit comments

Comments
 (0)