diff options
| -rw-r--r-- | WORKSPACE | 16 | ||||
| -rw-r--r-- | tools/android/BUILD.tools | 12 | ||||
| -rw-r--r-- | tools/android/desugar.sh | 32 |
3 files changed, 37 insertions, 23 deletions
@@ -93,24 +93,24 @@ new_local_repository( http_archive( name = "desugar_jdk_libs", - url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip", + url = "https://github.com/google/desugar_jdk_libs/archive/fd937f4180c1b557805219af4482f1a27eb0ff2b.zip", # Computed using "shasum -a 256 <zip>" - sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b", - strip_prefix = "desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd", + sha256 = "43b8fcc56a180e178d498f375fbeb95e8b65b9bf6c2da91ae3ae0332521a1a12", + strip_prefix = "desugar_jdk_libs-fd937f4180c1b557805219af4482f1a27eb0ff2b", ) load("//:distdir.bzl", "distdir_tar") distdir_tar( name = "additional_distfiles", dirname = "derived/distdir", - archives = ["f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"], + archives = ["fd937f4180c1b557805219af4482f1a27eb0ff2b.zip"], urls = { - "f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip" : - ["https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"], + "fd937f4180c1b557805219af4482f1a27eb0ff2b.zip" : + ["https://github.com/google/desugar_jdk_libs/archive/fd937f4180c1b557805219af4482f1a27eb0ff2b.zip"], }, sha256 = { - "f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip" : - "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b", + "fd937f4180c1b557805219af4482f1a27eb0ff2b.zip" : + "43b8fcc56a180e178d498f375fbeb95e8b65b9bf6c2da91ae3ae0332521a1a12", }, ) diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools index 8def828b18..e0474c942e 100644 --- a/tools/android/BUILD.tools +++ b/tools/android/BUILD.tools @@ -199,12 +199,10 @@ genrule( --rewrite_core_library_prefix java/time/ \ --rewrite_core_library_prefix java/util/stream/ \ --rewrite_core_library_prefix java/util/function/ \ - --rewrite_core_library_prefix java/util/Arrays8 \ --rewrite_core_library_prefix java/util/Comparators \ - --rewrite_core_library_prefix java/util/Date8 \ + --rewrite_core_library_prefix java/util/Desugar \ --rewrite_core_library_prefix java/util/DoubleSummaryStatistics \ --rewrite_core_library_prefix java/util/IntSummaryStatistics \ - --rewrite_core_library_prefix java/util/LinkedHashSet8 \ --rewrite_core_library_prefix java/util/LongSummaryStatistics \ --rewrite_core_library_prefix java/util/Objects \ --rewrite_core_library_prefix java/util/Optional \ @@ -212,11 +210,11 @@ genrule( --rewrite_core_library_prefix java/util/SortedSet\$$1 \ --rewrite_core_library_prefix java/util/Spliterator \ --rewrite_core_library_prefix java/util/StringJoiner \ - --rewrite_core_library_prefix java/util/TimeZone8 \ --rewrite_core_library_prefix java/util/Tripwire \ - --retarget_core_library_member "java/util/Arrays#stream->java/util/Arrays8" \ - --retarget_core_library_member "java/util/Arrays#spliterator->java/util/Arrays8" \ - --retarget_core_library_member "java/util/LinkedHashSet#spliterator->java/util/LinkedHashSet8" \ + --rewrite_core_library_prefix java/util/concurrent/atomic/DesugarAtomic \ + --retarget_core_library_member "java/util/Arrays#stream->java/util/DesugarArrays" \ + --retarget_core_library_member "java/util/Arrays#spliterator->java/util/DesugarArrays" \ + --retarget_core_library_member "java/util/LinkedHashSet#spliterator->java/util/DesugarLinkedHashSet" \ --emulate_core_library_interface java/util/Collection \ --emulate_core_library_interface java/util/Map \ --emulate_core_library_interface java/util/Map\$$Entry \ diff --git a/tools/android/desugar.sh b/tools/android/desugar.sh index 9b7b48df4c..a37b6f95d5 100644 --- a/tools/android/desugar.sh +++ b/tools/android/desugar.sh @@ -58,19 +58,19 @@ readonly DESUGAR_JAVA8_LIBS_CONFIG=(--rewrite_core_library_prefix java/time/ \ --rewrite_core_library_prefix java/lang/Double8 \ --rewrite_core_library_prefix java/lang/Integer8 \ --rewrite_core_library_prefix java/lang/Long8 \ + --rewrite_core_library_prefix java/lang/Math8 \ --rewrite_core_library_prefix java/util/stream/ \ --rewrite_core_library_prefix java/util/function/ \ - --rewrite_core_library_prefix java/util/Arrays8 \ - --rewrite_core_library_prefix java/util/Date8 \ + --rewrite_core_library_prefix java/util/Desugar \ --rewrite_core_library_prefix java/util/DoubleSummaryStatistics \ --rewrite_core_library_prefix java/util/IntSummaryStatistics \ - --rewrite_core_library_prefix java/util/LinkedHashSet8 \ --rewrite_core_library_prefix java/util/LongSummaryStatistics \ --rewrite_core_library_prefix java/util/Objects \ --rewrite_core_library_prefix java/util/Optional \ --rewrite_core_library_prefix java/util/PrimitiveIterator \ --rewrite_core_library_prefix java/util/Spliterator \ --rewrite_core_library_prefix java/util/StringJoiner \ + --rewrite_core_library_prefix java/util/concurrent/atomic/DesugarAtomic \ --retarget_core_library_member "java/lang/Double#max->java/lang/Double8" \ --retarget_core_library_member "java/lang/Double#min->java/lang/Double8" \ --retarget_core_library_member "java/lang/Double#sum->java/lang/Double8" \ @@ -80,11 +80,27 @@ readonly DESUGAR_JAVA8_LIBS_CONFIG=(--rewrite_core_library_prefix java/time/ \ --retarget_core_library_member "java/lang/Long#max->java/lang/Long8" \ --retarget_core_library_member "java/lang/Long#min->java/lang/Long8" \ --retarget_core_library_member "java/lang/Long#sum->java/lang/Long8" \ - --retarget_core_library_member "java/util/Arrays#stream->java/util/Arrays8" \ - --retarget_core_library_member "java/util/Arrays#spliterator->java/util/Arrays8" \ - --retarget_core_library_member "java/util/LinkedHashSet#spliterator->java/util/LinkedHashSet8" \ - --retarget_core_library_member "java/util/Date#from->java/util/Date8" \ - --retarget_core_library_member "java/util/Date#toInstant->java/util/Date8" \ + --retarget_core_library_member "java/lang/Math#toIntExact->java/lang/Math8" \ + --retarget_core_library_member "java/util/Arrays#stream->java/util/DesugarArrays" \ + --retarget_core_library_member "java/util/Arrays#spliterator->java/util/DesugarArrays" \ + --retarget_core_library_member "java/util/Calendar#toInstant->java/util/DesugarCalendar" \ + --retarget_core_library_member "java/util/Date#from->java/util/DesugarDate" \ + --retarget_core_library_member "java/util/Date#toInstant->java/util/DesugarDate" \ + --retarget_core_library_member "java/util/GregorianCalendar#from->java/util/DesugarGregorianCalendar" \ + --retarget_core_library_member "java/util/GregorianCalendar#toZonedDateTime->java/util/DesugarGregorianCalendar" \ + --retarget_core_library_member "java/util/LinkedHashSet#spliterator->java/util/DesugarLinkedHashSet" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicInteger#getAndUpdate->java/util/concurrent/atomic/DesugarAtomicInteger" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicInteger#updateAndGet->java/util/concurrent/atomic/DesugarAtomicInteger" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicInteger#getAndAccumulate->java/util/concurrent/atomic/DesugarAtomicInteger" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicInteger#accumulateAndGet->java/util/concurrent/atomic/DesugarAtomicInteger" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicLong#getAndUpdate->java/util/concurrent/atomic/DesugarAtomicLong" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicLong#updateAndGet->java/util/concurrent/atomic/DesugarAtomicLong" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicLong#getAndAccumulate->java/util/concurrent/atomic/DesugarAtomicLong" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicLong#accumulateAndGet->java/util/concurrent/atomic/DesugarAtomicLong" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicReference#getAndUpdate->java/util/concurrent/atomic/DesugarAtomicReference" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicReference#updateAndGet->java/util/concurrent/atomic/DesugarAtomicReference" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicReference#getAndAccumulate->java/util/concurrent/atomic/DesugarAtomicReference" \ + --retarget_core_library_member "java/util/concurrent/atomic/AtomicReference#accumulateAndGet->java/util/concurrent/atomic/DesugarAtomicReference" \ --emulate_core_library_interface java/util/Collection \ --emulate_core_library_interface java/util/Map \ --emulate_core_library_interface java/util/Map\$Entry \ |