commit 077a73f524ed82d565c24d0e9c72512c78fb439a
author Ian Zerny <zerny@google.com> Tue Oct 31 09:05:47 2023 +0100
committer Ian Zerny <zerny@google.com> Tue Oct 31 09:05:47 2023 +0100
tree 3d8e05a7c1b8480d39a0536989bf03f877a5e6b6
parent ca82e34ab73b8092f66cfa0242a0b5a033efd8d2

Archive threading modules

Bug: b/304992619
Change-Id: Ia42d3ddd8bbc85959abaa0371813b1eaa651ccb7

tools/archive.py

diff --git a/tools/archive.py b/tools/archive.py
index 1632231..eb4ab98 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -173,6 +173,8 @@
                 utils.GRADLE_TASK_CONSOLIDATED_LICENSE,
                 utils.GRADLE_TASK_KEEP_ANNO_JAR, utils.GRADLE_TASK_R8,
                 utils.GRADLE_TASK_R8LIB, utils.GRADLE_TASK_R8LIB_NO_DEPS,
+                utils.GRADLE_TASK_THREADING_MODULE_BLOCKING,
+                utils.GRADLE_TASK_THREADING_MODULE_SINGLE_THREADED,
                 utils.GRADLE_TASK_RETRACE, utils.GRADLE_TASK_RETRACE_NO_DEPS,
                 utils.GRADLE_TASK_SOURCE_JAR,
                 utils.GRADLE_TASK_SWISS_ARMY_KNIFE, '-Pno_internal'
@@ -233,6 +235,8 @@
             utils.R8LIB_JAR + '_map.zip', utils.R8_FULL_EXCLUDE_DEPS_JAR,
             utils.R8LIB_EXCLUDE_DEPS_JAR, utils.R8LIB_EXCLUDE_DEPS_JAR + '.map',
             utils.R8LIB_EXCLUDE_DEPS_JAR + '_map.zip', utils.MAVEN_ZIP_LIB,
+            utils.THREADING_MODULE_BLOCKING_JAR,
+            utils.THREADING_MODULE_SINGLE_THREADED_JAR,
             utils.DESUGAR_CONFIGURATION, utils.DESUGAR_CONFIGURATION_MAVEN_ZIP,
             utils.DESUGAR_CONFIGURATION_JDK11_LEGACY,
             utils.DESUGAR_CONFIGURATION_JDK11_LEGACY_MAVEN_ZIP,

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index 06fc3a7..3ef0a8f 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -46,6 +46,8 @@
 GRADLE_TASK_R8 = ':main:r8WithRelocatedDeps'
 GRADLE_TASK_R8LIB = ':test:assembleR8LibWithRelocatedDeps'
 GRADLE_TASK_R8LIB_NO_DEPS = ':test:assembleR8LibNoDeps'
+GRADLE_TASK_THREADING_MODULE_BLOCKING = ':main:threadingModuleBlockingJar'
+GRADLE_TASK_THREADING_MODULE_SINGLE_THREADED = ':main:threadingModuleSingleThreadedJar'
 GRADLE_TASK_RETRACE = ':test:assembleRetraceLibWithRelocatedDeps'
 GRADLE_TASK_RETRACE_NO_DEPS = ':test:assembleRetraceLibNoDeps'
 GRADLE_TASK_SOURCE_JAR = ':test:packageSources'
@@ -65,6 +67,8 @@
 R8_SRC_JAR = os.path.join(LIBS, 'r8-src.jar')
 R8LIB_EXCLUDE_DEPS_JAR = os.path.join(LIBS, 'r8lib-exclude-deps.jar')
 R8_FULL_EXCLUDE_DEPS_JAR = os.path.join(LIBS, 'r8-full-exclude-deps.jar')
+THREADING_MODULE_BLOCKING_JAR = os.path.join(LIBS, 'threading-module-blocking.jar')
+THREADING_MODULE_SINGLE_THREADED_JAR = os.path.join(LIBS, 'threading-module-single-threaded.jar')
 R8RETRACE_JAR = os.path.join(LIBS, 'r8retrace.jar')
 R8RETRACE_EXCLUDE_DEPS_JAR = os.path.join(LIBS, 'r8retrace-exclude-deps.jar')
 R8_TESTS_JAR = os.path.join(LIBS, 'r8tests.jar')