Skip to content

Commit 586de95

Browse files
ahumeskycopybara-github
ahumesky
authored and
copybara-github
committed
Update Android remote tools to ensure Bazel uses the latest Android tooling that has been updated to support AndroidX databinding generation.
Updates Android remote tooling version to 0.21.0. Also updates list of desugar flags for new desugarer version included in the tools, and in particular remove usages of "--retarget_core_library_member", which the updated desugar tool no longer needs. PiperOrigin-RevId: 363212429
1 parent 8d4663a commit 586de95

File tree

5 files changed

+23
-50
lines changed

5 files changed

+23
-50
lines changed

‎WORKSPACE

+10-10
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,16 @@ distdir_tar(
129129
name = "additional_distfiles",
130130
# Keep in sync with the archives fetched as part of building bazel.
131131
archives = [
132-
"android_tools_pkg-0.19.0rc3.tar.gz",
132+
"android_tools_pkg-0.21.0.tar.gz",
133133
],
134134
dirname = "derived/distdir",
135135
dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "additional_distfiles" in attrs["used_in"]},
136136
sha256 = {
137-
"android_tools_pkg-0.19.0rc3.tar.gz": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
137+
"android_tools_pkg-0.21.0.tar.gz": "a4a17c811de5ca0df81b93ccc34e4b8494da9176bda4c85512083c2172494190",
138138
},
139139
urls = {
140-
"android_tools_pkg-0.19.0rc3.tar.gz": [
141-
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz",
140+
"android_tools_pkg-0.21.0.tar.gz": [
141+
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.21.0.tar.gz",
142142
],
143143
},
144144
)
@@ -392,7 +392,7 @@ distdir_tar(
392392
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz",
393393
"zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz",
394394
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip",
395-
"android_tools_pkg-0.19.0rc3.tar.gz",
395+
"android_tools_pkg-0.21.0.tar.gz",
396396
],
397397
dirname = "test_WORKSPACE/distdir",
398398
dist_deps = {dep: attrs for dep, attrs in DIST_DEPS.items() if "test_WORKSPACE_files" in attrs["used_in"]},
@@ -402,16 +402,16 @@ distdir_tar(
402402
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
403403
"zulu11.45.27-ca-jdk11.0.10-macosx_aarch64.tar.gz": "3dcc636e64ae58b922269c2dc9f20f6f967bee90e3f6847d643c4a566f1e8d8a",
404404
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
405-
"android_tools_pkg-0.19.0rc3.tar.gz": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
405+
"android_tools_pkg-0.21.0.tar.gz": "a4a17c811de5ca0df81b93ccc34e4b8494da9176bda4c85512083c2172494190",
406406
},
407407
urls = {
408408
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"],
409409
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": ["https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"],
410410
"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"],
411411
"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"],
412412
"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"],
413-
"android_tools_pkg-0.19.0rc3.tar.gz": [
414-
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz",
413+
"android_tools_pkg-0.21.0.tar.gz": [
414+
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.21.0.tar.gz",
415415
],
416416
},
417417
)
@@ -474,8 +474,8 @@ http_archive(
474474
name = "android_tools_for_testing",
475475
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
476476
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
477-
sha256 = "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
478-
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz",
477+
sha256 = "a4a17c811de5ca0df81b93ccc34e4b8494da9176bda4c85512083c2172494190", # DO_NOT_REMOVE_THIS_ANDROID_TOOLS_UPDATE_MARKER
478+
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.21.0.tar.gz",
479479
)
480480

481481
# Used in 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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
33
# This must be kept in sync with the top-level WORKSPACE file.
44
http_archive(
55
name = "android_tools",
6-
sha256 = "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
7-
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz",
6+
sha256 = "a4a17c811de5ca0df81b93ccc34e4b8494da9176bda4c85512083c2172494190",
7+
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.21.0.tar.gz",
88
)

‎tools/android/BUILD.tools

+5-6
Original file line numberDiff line numberDiff line change
@@ -208,30 +208,29 @@ genrule(
208208
--noemit_dependency_metadata_as_needed \
209209
--nodesugar_try_with_resources_if_needed \
210210
--desugar_supported_core_libs \
211+
--rewrite_core_library_prefix java/time/ \
211212
--rewrite_core_library_prefix java/lang/Double8 \
212213
--rewrite_core_library_prefix java/lang/Integer8 \
213214
--rewrite_core_library_prefix java/lang/Long8 \
214215
--rewrite_core_library_prefix java/lang/Math8 \
215-
--rewrite_core_library_prefix java/time/ \
216+
--rewrite_core_library_prefix java/io/Desugar \
217+
--rewrite_core_library_prefix java/io/UncheckedIOException \
216218
--rewrite_core_library_prefix java/util/stream/ \
217219
--rewrite_core_library_prefix java/util/function/ \
218-
--rewrite_core_library_prefix java/util/Comparators \
219220
--rewrite_core_library_prefix java/util/Desugar \
220221
--rewrite_core_library_prefix java/util/DoubleSummaryStatistics \
221222
--rewrite_core_library_prefix java/util/IntSummaryStatistics \
222223
--rewrite_core_library_prefix java/util/LongSummaryStatistics \
223224
--rewrite_core_library_prefix java/util/Objects \
224225
--rewrite_core_library_prefix java/util/Optional \
225226
--rewrite_core_library_prefix java/util/PrimitiveIterator \
226-
--rewrite_core_library_prefix java/util/SortedSet\\$$1 \
227227
--rewrite_core_library_prefix java/util/Spliterator \
228228
--rewrite_core_library_prefix java/util/StringJoiner \
229-
--rewrite_core_library_prefix java/util/Tripwire \
229+
--rewrite_core_library_prefix javadesugar/testing/ \
230230
--rewrite_core_library_prefix java/util/concurrent/ConcurrentHashMap \
231-
--rewrite_core_library_prefix java/util/concurrent/DesugarUnsafe \
232231
--rewrite_core_library_prefix java/util/concurrent/ThreadLocalRandom \
233232
--rewrite_core_library_prefix java/util/concurrent/atomic/DesugarAtomic \
234-
--retarget_core_library_member "java/util/LinkedHashSet#spliterator->java/util/DesugarLinkedHashSet" \
233+
--auto_desugar_shadowed_api_use \
235234
--emulate_core_library_interface java/util/Collection \
236235
--emulate_core_library_interface java/util/Map \
237236
--emulate_core_library_interface java/util/Map\\$$Entry \

‎tools/android/desugar.sh

+5-31
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ readonly DESUGAR_JAVA8_LIBS_CONFIG=(--rewrite_core_library_prefix java/time/ \
5959
--rewrite_core_library_prefix java/lang/Integer8 \
6060
--rewrite_core_library_prefix java/lang/Long8 \
6161
--rewrite_core_library_prefix java/lang/Math8 \
62+
--rewrite_core_library_prefix java/io/Desugar \
63+
--rewrite_core_library_prefix java/io/UncheckedIOException \
6264
--rewrite_core_library_prefix java/util/stream/ \
6365
--rewrite_core_library_prefix java/util/function/ \
6466
--rewrite_core_library_prefix java/util/Desugar \
@@ -70,45 +72,17 @@ readonly DESUGAR_JAVA8_LIBS_CONFIG=(--rewrite_core_library_prefix java/time/ \
7072
--rewrite_core_library_prefix java/util/PrimitiveIterator \
7173
--rewrite_core_library_prefix java/util/Spliterator \
7274
--rewrite_core_library_prefix java/util/StringJoiner \
75+
--rewrite_core_library_prefix javadesugar/testing/ \
7376
--rewrite_core_library_prefix java/util/concurrent/ConcurrentHashMap \
7477
--rewrite_core_library_prefix java/util/concurrent/ThreadLocalRandom \
7578
--rewrite_core_library_prefix java/util/concurrent/atomic/DesugarAtomic \
76-
--retarget_core_library_member "java/lang/Double#max->java/lang/Double8" \
77-
--retarget_core_library_member "java/lang/Double#min->java/lang/Double8" \
78-
--retarget_core_library_member "java/lang/Double#sum->java/lang/Double8" \
79-
--retarget_core_library_member "java/lang/Integer#max->java/lang/Integer8" \
80-
--retarget_core_library_member "java/lang/Integer#min->java/lang/Integer8" \
81-
--retarget_core_library_member "java/lang/Integer#sum->java/lang/Integer8" \
82-
--retarget_core_library_member "java/lang/Long#max->java/lang/Long8" \
83-
--retarget_core_library_member "java/lang/Long#min->java/lang/Long8" \
84-
--retarget_core_library_member "java/lang/Long#sum->java/lang/Long8" \
85-
--retarget_core_library_member "java/lang/Math#toIntExact->java/lang/Math8" \
86-
--retarget_core_library_member "java/util/Arrays#stream->java/util/DesugarArrays" \
87-
--retarget_core_library_member "java/util/Arrays#spliterator->java/util/DesugarArrays" \
88-
--retarget_core_library_member "java/util/Calendar#toInstant->java/util/DesugarCalendar" \
89-
--retarget_core_library_member "java/util/Date#from->java/util/DesugarDate" \
90-
--retarget_core_library_member "java/util/Date#toInstant->java/util/DesugarDate" \
91-
--retarget_core_library_member "java/util/GregorianCalendar#from->java/util/DesugarGregorianCalendar" \
92-
--retarget_core_library_member "java/util/GregorianCalendar#toZonedDateTime->java/util/DesugarGregorianCalendar" \
93-
--retarget_core_library_member "java/util/LinkedHashSet#spliterator->java/util/DesugarLinkedHashSet" \
94-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicInteger#getAndUpdate->java/util/concurrent/atomic/DesugarAtomicInteger" \
95-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicInteger#updateAndGet->java/util/concurrent/atomic/DesugarAtomicInteger" \
96-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicInteger#getAndAccumulate->java/util/concurrent/atomic/DesugarAtomicInteger" \
97-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicInteger#accumulateAndGet->java/util/concurrent/atomic/DesugarAtomicInteger" \
98-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicLong#getAndUpdate->java/util/concurrent/atomic/DesugarAtomicLong" \
99-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicLong#updateAndGet->java/util/concurrent/atomic/DesugarAtomicLong" \
100-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicLong#getAndAccumulate->java/util/concurrent/atomic/DesugarAtomicLong" \
101-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicLong#accumulateAndGet->java/util/concurrent/atomic/DesugarAtomicLong" \
102-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicReference#getAndUpdate->java/util/concurrent/atomic/DesugarAtomicReference" \
103-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicReference#updateAndGet->java/util/concurrent/atomic/DesugarAtomicReference" \
104-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicReference#getAndAccumulate->java/util/concurrent/atomic/DesugarAtomicReference" \
105-
--retarget_core_library_member "java/util/concurrent/atomic/AtomicReference#accumulateAndGet->java/util/concurrent/atomic/DesugarAtomicReference" \
79+
--auto_desugar_shadowed_api_use \
10680
--emulate_core_library_interface java/util/Collection \
10781
--emulate_core_library_interface java/util/Map \
10882
--emulate_core_library_interface java/util/Map\$Entry \
10983
--emulate_core_library_interface java/util/Iterator \
11084
--emulate_core_library_interface java/util/Comparator \
111-
--dont_rewrite_core_library_invocation "java/util/Iterator#remove")
85+
--dont_rewrite_core_library_invocation "java/util/Iterator#remove" )
11286

11387
# Check for params file. Desugar doesn't accept a mix of params files and flags
11488
# directly on the command line, so we need to build a new params file that adds

‎tools/android/runtime_deps/upload_android_tools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
set -euo pipefail
3232

3333
# The version of android_tools.tar.gz
34-
VERSION="0.19.0rc3"
34+
VERSION="0.21.0"
3535
VERSIONED_FILENAME="android_tools_pkg-$VERSION.tar.gz"
3636

3737
# Create a temp directory to hold the versioned tarball, and clean it up when the script exits.

0 commit comments

Comments
 (0)