commit 88b47caf6a5487beb6f82929acbfa880e3423f4b
author Rico Wind <ricow@google.com> Wed Oct 11 11:00:01 2023 +0200
committer Rico Wind <ricow@google.com> Wed Oct 11 09:13:39 2023 +0000
tree 44021d8a1ac3d98a6a806b83cb05a74372c30de4
parent 0311076e8c745c30e2de0f0553de7f9a964b2f2c

Use new gradle targets for update_prebuilds_in_android

Bug: b/303600414
Change-Id: I8ae03292997699d9cfe3e5ab5e6bc1d31954e430

tools/update_prebuilds_in_android.py

diff --git a/tools/update_prebuilds_in_android.py b/tools/update_prebuilds_in_android.py
index 4dfbb7d..45e27e6 100755
--- a/tools/update_prebuilds_in_android.py
+++ b/tools/update_prebuilds_in_android.py
@@ -117,10 +117,11 @@
 
 def main_build(maps, max_memory_size, targets, target_root):
   jar_targets = JAR_TARGETS_MAP[targets]
-  gradle_args = map(lambda t: t[0], jar_targets)
+  gradle_args = [utils.GRADLE_TASK_R8LIB if targets == 'lib'
+                 else utils.GRADLE_TASK_R8]
   if max_memory_size:
     gradle_args.append('-Dorg.gradle.jvmargs=-Xmx' + max_memory_size)
-  gradle.RunGradle(gradle_args)
+  gradle.RunGradle(gradle_args, new_gradle=True)
   copy_jar_targets(utils.LIBS, target_root, jar_targets, maps)
   copy_other_targets(utils.GENERATED_LICENSE_DIR, target_root)