Update desugared_library_jdk_11 deps
This updates to
https://github.com/google/desugar_jdk_libs/commit/b36f01c0f06872af53aa089feef1256a1114df06
(commit for version 2.0.1)
Content of README.google:
Name: desugar_jdk_libs
URL: https://github.com/google/desugar_jdk_libs
Version: b36f01c0f06872af53aa089feef1256a1114df06
Revision: N/A
Date: Jan 27 2023
License: The GNU General Public License (GPL) (see LICENSE)
Description:
This project contains a small subset of OpenJDK libraries simplified for use on older runtimes.
Artifacts
desugar_jdk_libs.jar
desugar_jdk_libs_chm_only.jar
built with
bazel build //jdk11/src:d8_java_base_selected_with_addon.jar
bazel build //jdk11/src:java_base_chm_only
respectively.
Bug: b/266903708
Bug: b/256723819
Change-Id: I56fdeabac40e875cfced50cf07350b45de7004d9
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 49a22e5..5cd98c6 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -17,13 +17,13 @@
import com.android.tools.r8.benchmarks.BenchmarkResults;
import com.android.tools.r8.desugar.desugaredlibrary.test.LibraryDesugaringSpecification.CustomConversionVersion;
import com.android.tools.r8.dex.ApplicationReader;
+import com.android.tools.r8.errors.Unimplemented;
import com.android.tools.r8.errors.Unreachable;
import com.android.tools.r8.graph.AppView;
import com.android.tools.r8.graph.AssemblyWriter;
import com.android.tools.r8.graph.DexApplication;
import com.android.tools.r8.graph.DexItemFactory;
import com.android.tools.r8.graph.DirectMappedDexApplication;
-import com.android.tools.r8.keepanno.utils.Unimplemented;
import com.android.tools.r8.origin.Origin;
import com.android.tools.r8.position.Position;
import com.android.tools.r8.shaking.FilteredClassPath;
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 09ec0a7..5293d6c 100644
--- a/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
+++ b/third_party/openjdk/desugar_jdk_libs_11.tar.gz.sha1
@@ -1,2 +1 @@
-ff55164b1eb717bd318bda08c6fc255405a765dc
-
+9d6ecb0b0580c1bed57aeb22d6f735b0e01412cf
\ No newline at end of file
diff --git a/tools/archive_desugar_jdk_libs.py b/tools/archive_desugar_jdk_libs.py
index 08f453e..6f073eb 100755
--- a/tools/archive_desugar_jdk_libs.py
+++ b/tools/archive_desugar_jdk_libs.py
@@ -171,6 +171,20 @@
raise Exception('Variant ' + variant + ' is not supported')
if variant != 'jdk8' and variant != 'jdk11_legacy' and version is None:
raise Exception('Variant ' + variant + ' require version for undesugaring')
+ if variant != 'jdk8':
+ # Hack to workaround b/256723819.
+ os.remove(
+ join(
+ checkout_dir,
+ "jdk11",
+ "src",
+ "java.base",
+ "share",
+ "classes",
+ "java",
+ "time",
+ "format",
+ "DesugarDateTimeFormatterBuilder.java"))
with utils.ChangedWorkingDirectory(checkout_dir):
with utils.TempDir() as androidHomeTemp:
setUpFakeAndroidHome(androidHomeTemp)
diff --git a/tools/desugar_jdk_libs_update.py b/tools/desugar_jdk_libs_update.py
index 2e751e9..213b9b7 100755
--- a/tools/desugar_jdk_libs_update.py
+++ b/tools/desugar_jdk_libs_update.py
@@ -28,6 +28,19 @@
if (args.desugar_jdk_libs_revision):
subprocess.check_call(
['git', '-C', checkout_dir, 'checkout', args.desugar_jdk_libs_revision])
+ print("Hack to workaround b/256723819")
+ os.remove(
+ join(
+ checkout_dir,
+ "jdk11",
+ "src",
+ "java.base",
+ "share",
+ "classes",
+ "java",
+ "time",
+ "format",
+ "DesugarDateTimeFormatterBuilder.java"))
print("Building desugared library")
bazel = os.path.join(utils.BAZEL_TOOL, 'lib', 'bazel', 'bin', 'bazel')
with utils.ChangedWorkingDirectory(checkout_dir):
