Update desugared library in third_party to 1.1.3
Resolved conflict in tools/utils.py:
git checkout --ours tools/utils.py
This updates the desugared library in third_party/openjdk/desugared_jdk_libs
to version 1.1.3 (https://github.com/google/desugar_jdk_libs/commit/4df9570f26ac93c82bf881cdc18346e10056d72f).
The JAR is built on the bot and copied from
gs://r8-releases/raw/desugar_jdk_libs/1.1.3/desugar_jdk_libs.jar
This also renames the JAR from libjava.jar to desugar_jdk_libs.jar.
Content of README.google:
Name: desugar_jdk_libs
URL: https://github.com/google/desugar_jdk_libs
Version: 4df9570f26ac93c82bf881cdc18346e10056d72f
Revision: N/A
Date: Feb 15 2021
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.
Bug: 179397308
Change-Id: If35a1083bcdf8161ca425490637398028327700d
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 73e7e9d..1168a65 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -128,7 +128,8 @@
public static final String JAVA_8_RUNTIME = "third_party/openjdk/openjdk-rt-1.8/rt.jar";
public static final String DESUGAR_JDK_LIBS =
- System.getProperty("desugar_jdk_libs", "third_party/openjdk/desugar_jdk_libs/libjava.jar");
+ System.getProperty(
+ "desugar_jdk_libs", "third_party/openjdk/desugar_jdk_libs/desugar_jdk_libs.jar");
public static final String CORE_LAMBDA_STUBS =
"third_party/core-lambda-stubs/core-lambda-stubs.jar";
public static final String JSR223_RI_JAR = "third_party/jsr223-api-1.0/jsr223-api-1.0.jar";
diff --git a/third_party/openjdk/desugar_jdk_libs.tar.gz.sha1 b/third_party/openjdk/desugar_jdk_libs.tar.gz.sha1
index 7b8d748..1fe619a 100644
--- a/third_party/openjdk/desugar_jdk_libs.tar.gz.sha1
+++ b/third_party/openjdk/desugar_jdk_libs.tar.gz.sha1
@@ -1 +1 @@
-2fdc16c4253420d7e240d5cf109bda5856984a8d
\ No newline at end of file
+653b4fe97b5dface6a31b9a6d94063a91a7f80be
\ No newline at end of file
