commit e18fa6e165ff963153a884cf78dc496511133bcd
author Søren Gjesse <sgjesse@google.com> Fri Jun 24 15:14:53 2022 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Jun 27 08:43:45 2022 +0000
tree 51d357db1a06a58270278872a451953662f69912
parent bd19c1bdcbb3537b634a9d6754510692919c6963

Cleanup building the desugared library configurations

* Build both JDK-8 and JDK-11 legacy configurations
* Fix the filtering of the legacy conversions


Make the version check depend on variant

Test: tools/archive.py --dry-run --dry-run-output /tmp/dry

Change-Id: Idf261a5e9516c557c68b5261feda0d88fc28adde

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index cd41ad0..1fb323f 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -66,6 +66,7 @@
 R8LIB_TESTS_DEPS_JAR = R8_TESTS_DEPS_JAR
 MAVEN_ZIP = os.path.join(LIBS, 'r8.zip')
 MAVEN_ZIP_LIB = os.path.join(LIBS, 'r8lib.zip')
+LIBRARY_DESUGAR_CONVERSIONS_LEGACY_ZIP = os.path.join(LIBS, 'library_desugar_conversions_legacy.jar')
 LIBRARY_DESUGAR_CONVERSIONS_ZIP = os.path.join(LIBS, 'library_desugar_conversions.jar')
 
 DESUGAR_CONFIGURATION = os.path.join(
@@ -78,8 +79,8 @@
       'third_party', 'openjdk', 'desugar_jdk_libs_11', 'desugar_jdk_libs.jar')
 DESUGAR_CONFIGURATION_MAVEN_ZIP = os.path.join(
   LIBS, 'desugar_jdk_libs_configuration.zip')
-DESUGAR_CONFIGURATION_LEGACY_JDK11_MAVEN_ZIP = os.path.join(
-  LIBS, 'desugar_jdk_libs_configuration_legacy_jdk11.zip')
+DESUGAR_CONFIGURATION_JDK11_LEGACY_MAVEN_ZIP = os.path.join(
+  LIBS, 'desugar_jdk_libs_configuration_jdk11_legacy.zip')
 GENERATED_LICENSE = os.path.join(GENERATED_LICENSE_DIR, 'LICENSE')
 RT_JAR = os.path.join(REPO_ROOT, 'third_party/openjdk/openjdk-rt-1.8/rt.jar')
 R8LIB_KEEP_RULES = os.path.join(REPO_ROOT, 'src/main/keep.txt')