commit 5614efc02df144c80feab4bb5f9fb4f9936fb985
author Søren Gjesse <sgjesse@google.com> Fri Jun 24 12:25:33 2022 +0200
committer Søren Gjesse <sgjesse@google.com> Fri Jun 24 10:30:58 2022 +0000
tree 47a99ca885ee5f9cde1db15092b130d3ebed5d5b
parent 608b508a34d84529f241f500fd8af68c285a44ab

Make the version check depend on variant when archiving desugared library

Change-Id: Ic90561a9f26dddb2079b5a550715c8579e124ecb

tools/archive_desugar_jdk_libs.py

diff --git a/tools/archive_desugar_jdk_libs.py b/tools/archive_desugar_jdk_libs.py
index 2f13541..10b300a 100755
--- a/tools/archive_desugar_jdk_libs.py
+++ b/tools/archive_desugar_jdk_libs.py
@@ -29,7 +29,8 @@
 import sys
 import utils
 
-VERSION_FILE = 'VERSION_JDK11.txt'
+VERSION_FILE_JDK8 = 'VERSION.txt'
+VERSION_FILE_JDK11 = 'VERSION_JDK11.txt'
 LIBRARY_NAME = 'desugar_jdk_libs'
 
 def ParseOptions(argv):
@@ -170,7 +171,10 @@
 
   with utils.TempDir() as checkout_dir:
     CloneDesugaredLibrary(options.github_account, checkout_dir)
-    version = GetVersion(os.path.join(checkout_dir, VERSION_FILE))
+    version = GetVersion(
+      os.path.join(
+        checkout_dir,
+        VERSION_FILE_JDK11 if variant == 'jdk11' else VERSION_FILE_JDK8))
 
     destination = archive.GetVersionDestination(
         'gs://', LIBRARY_NAME + '/' + version, is_main)