commit 428fc8d75169e80e474d367f04b49352d51a64d4
author Rico Wind <ricow@google.com> Tue Oct 10 11:21:23 2023 +0200
committer Rico Wind <ricow@google.com> Tue Oct 10 12:46:43 2023 +0000
tree 12a9fd66add1e81b17affae02640b2fc938a20e9
parent b1ef5d65d9c465bff265b0258c1cfb6817dac4b2

Update run_on_app.py to new gradle

Bug: b/303599101
Fixes: 303599101

Change-Id: I73bbcee1f9d7d554f3fbbfddab72caa988531f28

tools/run_on_app.py

diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index cbf1762..ce3a4ac 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -239,7 +239,7 @@
 def run_all(options, args):
   # Build first so that each job won't.
   if should_build(options):
-    gradle.RunGradle(['r8lib'])
+    gradle.RunGradle([utils.GRADLE_TASK_R8LIB], new_gradle=True)
     options.no_build = True
   assert not should_build(options)
 
@@ -712,7 +712,9 @@
           jar = os.path.join(utils.LIBS, 'r8-' + options.hash + '.jar')
           main = 'com.android.tools.r8.' + options.compiler.upper()
         if should_build(options):
-          gradle.RunGradle(['r8lib' if tool.startswith('r8lib') else 'r8'])
+          gradle.RunGradle([
+              utils.GRADLE_TASK_R8LIB if tool.startswith('r8lib')
+              else UTILS.GRADLE_TASK_R8], new_gradle=True)
         t0 = time.time()
         exit_code = toolhelper.run(tool, args,
             build=False,