Add released desugared library configurations
Each directory contains:
desugar_jdk_libs_configuration.jar
desugar_jdk_libs.jar
desugar.json
README.google
Each JAR is pulled from the released Maven artifact, and
desugar.json is META-INF/desugar/d8/desugar.json extracted from
desugar_jdk_libs_configuration.jar
The script scripts/import_released_desugar_jdk_libs.sh was used
to pull down the Maven artifiacs.
Content of README.google in all added dependencies:
Name: desugar_jdk_libs
URL: https://github.com/google/desugar_jdk_libs
Version: 793835fe272618b0086871ad70a1ffb80db749d1
Revision: N/A
Date: Feb 24 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: 191241408
Change-Id: I1bb0b0d882dcc8b790ebf8b8181145e9f6a47291
diff --git a/.gitignore b/.gitignore
index 24eead1..d78f4a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,6 +121,16 @@
third_party/openjdk/desugar_jdk_libs.tar.gz
third_party/openjdk/desugar_jdk_libs_11
third_party/openjdk/desugar_jdk_libs_11.tar.gz
+third_party/openjdk/desugar_jdk_libs_releases/1.0.9
+third_party/openjdk/desugar_jdk_libs_releases/1.0.9.tar.gz
+third_party/openjdk/desugar_jdk_libs_releases/1.0.10
+third_party/openjdk/desugar_jdk_libs_releases/1.0.10.tar.gz
+third_party/openjdk/desugar_jdk_libs_releases/1.1.0
+third_party/openjdk/desugar_jdk_libs_releases/1.1.0.tar.gz
+third_party/openjdk/desugar_jdk_libs_releases/1.1.1
+third_party/openjdk/desugar_jdk_libs_releases/1.1.1.tar.gz
+third_party/openjdk/desugar_jdk_libs_releases/1.1.5
+third_party/openjdk/desugar_jdk_libs_releases/1.1.5.tar.gz
third_party/openjdk/jdk-15/linux
third_party/openjdk/jdk-15/linux.tar.gz
third_party/openjdk/jdk-15/osx
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index faa8808..c3902b8 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -82,7 +82,10 @@
return results
def CopyRightInContents(f, contents):
- expected = ('#' if f.LocalPath().endswith('.py') else '//') + ' Copyright'
+ expected = '//'
+ if f.LocalPath().endswith('.py') or f.LocalPath().endswith('.sh'):
+ expected = '#'
+ expected = expected + ' Copyright'
for content_line in contents:
if expected in content_line:
return True
diff --git a/build.gradle b/build.gradle
index f69b505..7f0d08f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -336,6 +336,11 @@
"openjdk/openjdk-rt-1.8",
"openjdk/desugar_jdk_libs",
"openjdk/desugar_jdk_libs_11",
+ "openjdk/desugar_jdk_libs_releases/1.0.9",
+ "openjdk/desugar_jdk_libs_releases/1.0.10",
+ "openjdk/desugar_jdk_libs_releases/1.1.0",
+ "openjdk/desugar_jdk_libs_releases/1.1.1",
+ "openjdk/desugar_jdk_libs_releases/1.1.5",
"openjdk/jdk-11-test",
"proguard/proguard5.2.1",
"proguard/proguard6.0.1",
diff --git a/scripts/import_released_desugar_jdk_libs.sh b/scripts/import_released_desugar_jdk_libs.sh
new file mode 100755
index 0000000..6f02117
--- /dev/null
+++ b/scripts/import_released_desugar_jdk_libs.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# Copyright (c) 2021, the R8 project authors. Please see the AUTHORS file
+# for details. All rights reserved. Use of this source code is governed by a
+# BSD-style license that can be found in the LICENSE file.
+
+set -e
+set -x
+
+if [[ -z "$1" ]]; then
+ echo "No version argument supplied"
+ exit -1
+fi
+
+VERSION=$1
+
+RELEASES_ROOT=third_party/openjdk/desugar_jdk_libs_releases
+mkdir -p $RELEASES_ROOT
+RELEASED_VERSION_DIR=$RELEASES_ROOT/$VERSION
+if [[ -d $RELEASED_VERSION_DIR ]]; then
+ echo "$RELEASED_VERSION_DIR already exists"
+ exit -1
+fi
+
+MAVEN_REPO_DIR=/tmp/maven_repo_local
+rm -rf $MAVEN_REPO_DIR
+
+DOWNLOAD_DIR=/tmp/desugar_jdk_libs_download
+rm -rf $DOWNLOAD_DIR
+mkdir -p $DOWNLOAD_DIR
+
+mvn \
+ org.apache.maven.plugins:maven-dependency-plugin:2.4:get \
+ -Dmaven.repo.local=$MAVEN_REPO_DIR \
+ -DremoteRepositories=http://maven.google.com \
+ -Dartifact=com.android.tools:desugar_jdk_libs:$VERSION \
+ -Ddest=$DOWNLOAD_DIR/desugar_jdk_libs.jar
+
+mvn \
+ org.apache.maven.plugins:maven-dependency-plugin:2.4:get \
+ -Dmaven.repo.local=$MAVEN_REPO_DIR \
+ -DremoteRepositories=http://maven.google.com \
+ -Dartifact=com.android.tools:desugar_jdk_libs_configuration:$VERSION \
+ -Ddest=$DOWNLOAD_DIR/desugar_jdk_libs_configuration.jar
+
+ unzip $DOWNLOAD_DIR/desugar_jdk_libs_configuration.jar META-INF/desugar/d8/desugar.json -d $DOWNLOAD_DIR
+
+ mkdir $RELEASED_VERSION_DIR
+ cp $DOWNLOAD_DIR/desugar_jdk_libs.jar $RELEASED_VERSION_DIR
+ cp $DOWNLOAD_DIR/desugar_jdk_libs_configuration.jar $RELEASED_VERSION_DIR
+ cp $DOWNLOAD_DIR/META-INF/desugar/d8/desugar.json $RELEASED_VERSION_DIR/desugar.json
+ cp third_party/openjdk/desugar_jdk_libs/README.google $RELEASED_VERSION_DIR
+
+ (cd $RELEASES_ROOT && \
+ upload_to_google_storage.py -a --bucket r8-deps $VERSION && \
+ git add $VERSION.tar.gz.sha1)
diff --git a/third_party/openjdk/desugar_jdk_libs_releases/1.0.10.tar.gz.sha1 b/third_party/openjdk/desugar_jdk_libs_releases/1.0.10.tar.gz.sha1
new file mode 100644
index 0000000..ec8b41b
--- /dev/null
+++ b/third_party/openjdk/desugar_jdk_libs_releases/1.0.10.tar.gz.sha1
@@ -0,0 +1 @@
+ee0cf6f06d1f8f725a72f28826533bbcc407678e
\ No newline at end of file
diff --git a/third_party/openjdk/desugar_jdk_libs_releases/1.0.9.tar.gz.sha1 b/third_party/openjdk/desugar_jdk_libs_releases/1.0.9.tar.gz.sha1
new file mode 100644
index 0000000..10b5a1f
--- /dev/null
+++ b/third_party/openjdk/desugar_jdk_libs_releases/1.0.9.tar.gz.sha1
@@ -0,0 +1 @@
+e5b342cfdd5c0799c9c729e55d4258a4bd2b13c7
\ No newline at end of file
diff --git a/third_party/openjdk/desugar_jdk_libs_releases/1.1.0.tar.gz.sha1 b/third_party/openjdk/desugar_jdk_libs_releases/1.1.0.tar.gz.sha1
new file mode 100644
index 0000000..f42f4c4
--- /dev/null
+++ b/third_party/openjdk/desugar_jdk_libs_releases/1.1.0.tar.gz.sha1
@@ -0,0 +1 @@
+d49b2f1b946cfb868a843605a8c75f5d958fb2a6
\ No newline at end of file
diff --git a/third_party/openjdk/desugar_jdk_libs_releases/1.1.1.tar.gz.sha1 b/third_party/openjdk/desugar_jdk_libs_releases/1.1.1.tar.gz.sha1
new file mode 100644
index 0000000..1133b23
--- /dev/null
+++ b/third_party/openjdk/desugar_jdk_libs_releases/1.1.1.tar.gz.sha1
@@ -0,0 +1 @@
+57bafe4d948330c30123732981e40827a6e02479
\ No newline at end of file
diff --git a/third_party/openjdk/desugar_jdk_libs_releases/1.1.5.tar.gz.sha1 b/third_party/openjdk/desugar_jdk_libs_releases/1.1.5.tar.gz.sha1
new file mode 100644
index 0000000..522687f
--- /dev/null
+++ b/third_party/openjdk/desugar_jdk_libs_releases/1.1.5.tar.gz.sha1
@@ -0,0 +1 @@
+074f2bea4a557e48a92ffc6c572a791db655574c
\ No newline at end of file
