Reland "Generate method lists for lint based on library desugar configuration"
This reverts commit 40fe34dfdddfa1bfeca659f76964d6f76cedcd43 and fixes the
build issue by generating the desugar configuration maven zip after an r8.jar
with dependencies has been built.
Bug: 134732760
Change-Id: Ice744eb738556e32c77932e24f95f6cb488209aa
diff --git a/tools/archive.py b/tools/archive.py
index 1041b40..62e0e27 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -126,9 +126,6 @@
create_maven_release.generate_r8_maven_zip(utils.MAVEN_ZIP)
create_maven_release.generate_r8_maven_zip(
utils.MAVEN_ZIP_LIB, is_r8lib=True)
- # Create maven release of the desuage_jdk_libs configuration.
- create_maven_release.generate_desugar_configuration_maven_zip(
- utils.DESUGAR_CONFIGURATION_MAVEN_ZIP)
# Generate and copy a full build without dependencies.
gradle.RunGradleExcludeDeps([utils.R8, utils.R8_SRC])
@@ -149,6 +146,12 @@
utils.COMPATPROGUARDLIB,
'-Pno_internal'
])
+
+ # Create maven release of the desuage_jdk_libs configuration. This require
+ # an r8.jar with dependencies to have been built.
+ create_maven_release.generate_desugar_configuration_maven_zip(
+ utils.DESUGAR_CONFIGURATION_MAVEN_ZIP)
+
version = GetVersion()
is_master = IsMaster(version)
if is_master:
