commit f13d18f7f2778efd7aea9fbd270558ddde38df74
author Ian Zerny <zerny@google.com> Wed May 24 12:50:37 2023 +0200
committer Ian Zerny <zerny@google.com> Wed May 24 10:55:58 2023 +0000
tree e4a9175ca6f71404d7364bea7541b7950e4bbeba
parent 89bc5359bb98d0df12a85be05a215e60a8ef5419

Archive keepanno-annotations.jar

Bug: b/248408342
Change-Id: Id8e743c0ef192783406116de2f81ac895c21bb28

tools/archive.py

diff --git a/tools/archive.py b/tools/archive.py
index 558842c..27c3b25 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -166,6 +166,7 @@
           utils.R8RETRACE,
           utils.R8RETRACE_NO_DEPS,
           utils.LIBRARY_DESUGAR_CONVERSIONS,
+          utils.KEEPANNO_ANNOTATIONS_TARGET,
           '-Pno_internal'
       ])
 
@@ -238,6 +239,7 @@
       utils.DESUGAR_CONFIGURATION_JDK11_MINIMAL_MAVEN_ZIP,
       utils.DESUGAR_CONFIGURATION_JDK11_MAVEN_ZIP,
       utils.DESUGAR_CONFIGURATION_JDK11_NIO_MAVEN_ZIP,
+      utils.KEEPANNO_ANNOTATIONS_JAR,
       utils.GENERATED_LICENSE,
     ]:
       file_name = os.path.basename(file)

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index 5cb2cbe..b691b16 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -51,6 +51,7 @@
 R8_TESTS_DEPS_TARGET = 'RepackageTestDeps'
 R8LIB_TESTS_TARGET = 'configureTestForR8Lib'
 R8LIB_TESTS_DEPS_TARGET = R8_TESTS_DEPS_TARGET
+KEEPANNO_ANNOTATIONS_TARGET = 'keepAnnoJar'
 
 ALL_DEPS_JAR = os.path.join(LIBS, 'deps_all.jar')
 R8_JAR = os.path.join(LIBS, 'r8.jar')
@@ -70,6 +71,7 @@
 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')
+KEEPANNO_ANNOTATIONS_JAR = os.path.join(LIBS, 'keepanno-annotations.jar')
 
 DESUGAR_CONFIGURATION = os.path.join(
       'src', 'library_desugar', 'desugar_jdk_libs.json')