commit d10fec99f939477edbebfc4fc218a7ff26e89235
author Søren Gjesse <sgjesse@google.com> Mon Aug 19 11:27:07 2024 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Aug 21 11:41:36 2024 +0000
tree d54727569ceb14386eedb11ba999796b02091644
parent c36e1544933cb53cadc8f4636bebada42a30aeb2

Update desugared library for releasing version 2.1.0

Using revision 43b24570891d05e7c28a937ad8ce738536f90592 of
https://github.com/google/desugar_jdk_libs obtained with:

  tools/desugar_jdk_libs_update.py \
      --desugar-jdk-libs-revision \
      43b24570891d05e7c28a937ad8ce738536f90592

Bug: b/356561585
Change-Id: I5a2de4d9bf718d18668a54ab83c4744024eb45a3

third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1

diff --git a/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1 b/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
index c5ef954..8779e19 100644
--- a/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
+++ b/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
@@ -1 +1 @@
-d50abf6c508c1332eb80f35f5631e99e2e8329b5
\ No newline at end of file
+5b02bd53b6df482392dbd41b04c137b0b3c99388
\ No newline at end of file

tools/desugar_jdk_libs_update.py

diff --git a/tools/desugar_jdk_libs_update.py b/tools/desugar_jdk_libs_update.py
index 3514cf8..d5282c7 100755
--- a/tools/desugar_jdk_libs_update.py
+++ b/tools/desugar_jdk_libs_update.py
@@ -52,13 +52,10 @@
         print("Building desugared library")
         bazel = os.path.join(utils.BAZEL_TOOL, 'lib', 'bazel', 'bin', 'bazel')
         with utils.ChangedWorkingDirectory(checkout_dir):
-            for target in [
-                    ':desugar_jdk_libs_jdk11', '//jdk11/src:java_base_chm_only'
-            ]:
-                subprocess.check_call([
-                    bazel, '--bazelrc=/dev/null', 'build',
-                    '--spawn_strategy=local', '--verbose_failures', target
-                ])
+            subprocess.check_call([
+                bazel, '--bazelrc=/dev/null', 'build',
+                '--spawn_strategy=local', '--verbose_failures', ':desugar_jdk_libs_jdk11'
+            ])
 
         openjdk_dir = join('third_party', 'openjdk')
         openjdk_subdir = 'desugar_jdk_libs_11'
@@ -72,11 +69,9 @@
         os.remove(join(openjdk_dir, openjdk_subdir + '.tar.gz'))
         os.remove(join(openjdk_dir, openjdk_subdir + '.tar.gz.sha1'))
         os.mkdir(dest_dir)
-        for s in [(join(src_dir, 'd8_java_base_selected_with_addon.jar'),
-                   join(dest_dir, 'desugar_jdk_libs.jar')),
-                  (join(src_dir, 'java_base_chm_only.jar'),
-                   join(dest_dir, 'desugar_jdk_libs_chm_only.jar'))]:
-            shutil.copyfile(s[0], s[1])
+        shutil.copyfile(
+            join(src_dir, 'd8_java_base_selected_with_addon.jar'),
+            join(dest_dir, 'desugar_jdk_libs.jar'))
         for f in metadata_files:
             shutil.copyfile(join(tmp_dir, f), join(dest_dir, f))
         desugar_jdk_libs_hash = os.path.join(dest_dir, 'desugar_jdk_libs_hash')