commit 124c4c40e19dfb3578f1b71c12efde0e2d17f0f1
author Søren Gjesse <sgjesse@google.com> Mon Oct 18 12:37:41 2021 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Oct 18 11:16:47 2021 +0000
tree 15ec557f91cfaf04e8ee42a842296a2fad92dd79
parent cec4be2e2f9991ba1f8747ef504a7572b0ef2420

Update the archive_desugar_jdk_libs.py script

* Ensure desugared library build does not pick up any .blazerc file
* Add a --variant option to the command line
* Fix a bug picking the wrong maven release file

Bug: 203382252

Change-Id: I341f4d8fa5a32da3ff00356e0cafb5dbaa01a88a

tools/archive_desugar_jdk_libs.py

diff --git a/tools/archive_desugar_jdk_libs.py b/tools/archive_desugar_jdk_libs.py
index d2c1ef1..a44524e 100755
--- a/tools/archive_desugar_jdk_libs.py
+++ b/tools/archive_desugar_jdk_libs.py
@@ -33,6 +33,10 @@
 
 def ParseOptions(argv):
   result = optparse.OptionParser()
+  result.add_option('--variant',
+      help='.',
+      choices = ['jdk8', 'jdk11'],
+      default='jdk8')
   result.add_option('--dry-run', '--dry_run',
       help='Running on bot, use third_party dependency.',
       default=False,
@@ -90,7 +94,11 @@
     raise Exception('Variant ' + variant + 'is not supported')
   with utils.ChangedWorkingDirectory(checkout_dir):
     bazel = os.path.join(utils.BAZEL_TOOL, 'lib', 'bazel', 'bin', 'bazel')
-    cmd = [bazel, 'build', 'maven_release' + ('_jdk11' if variant == 'jdk11' else '')]
+    cmd = [
+        bazel,
+        '--bazelrc=/dev/null',
+        'build',
+        'maven_release' + ('_jdk11' if variant == 'jdk11' else '')]
     utils.PrintCmd(cmd)
     subprocess.check_call(cmd)
     cmd = [bazel, 'shutdown']
@@ -108,7 +116,7 @@
     maven_zip = os.path.join(
       checkout_dir,
       'bazel-bin',
-      LIBRARY_NAME + ('_jdk11' if variant != 'jdk11' else '') +'.zip')
+      LIBRARY_NAME + ('_jdk11' if variant == 'jdk11' else '') +'.zip')
     return (library_jar, maven_zip)
 
 
@@ -138,7 +146,7 @@
   if options.build_only:
     with utils.TempDir() as checkout_dir:
       CloneDesugaredLibrary(options.github_account, checkout_dir)
-      (library_jar, maven_zip) = BuildDesugaredLibrary(checkout_dir, "jdk8")
+      (library_jar, maven_zip) = BuildDesugaredLibrary(checkout_dir, options.variant)
       shutil.copyfile(
         library_jar,
         os.path.join(options.build_only, os.path.basename(library_jar)))
@@ -160,7 +168,7 @@
       raise Exception(
           'Target archive directory %s already exists' % destination)
 
-    (library_jar, maven_zip) = BuildDesugaredLibrary(checkout_dir, "jdk8")
+    (library_jar, maven_zip) = BuildDesugaredLibrary(checkout_dir, options.variant)
 
     storage_path = LIBRARY_NAME + '/' + version
     # Upload the jar file with the library.