commit 832a6629cdd3239f3dbdac6e64bf1bd5639fa3d1
author Søren Gjesse <sgjesse@google.com> Thu Oct 12 13:51:24 2023 +0200
committer Søren Gjesse <sgjesse@google.com> Thu Oct 12 13:51:24 2023 +0200
tree a3929c6e162137157eb23f23e50a0d1e2bc998b2
parent 9f7a6add8ddecefc1734f15f73b0f712b03b67a0

Fix tools/golem_build.py after updating tools/run_benchmark.py

Test: tools/run_benchmark.py --target d8 --benchmark HelloWorldDex .
Test: tools/run_benchmark.py --nolib --target d8 --benchmark HelloWorldDex .
Test: tools/golem_build.py

Bug: b/302999071
Change-Id: Id68a382d3f94d225f0fdc5223db3f73bc3d689fe

tools/golem_build.py

diff --git a/tools/golem_build.py b/tools/golem_build.py
index 1cbf39f..c1f0767 100755
--- a/tools/golem_build.py
+++ b/tools/golem_build.py
@@ -17,14 +17,8 @@
   return [ item.lower() for item in items ]
 
 def Main():
-  # TODO(b/302999071): Move java based benchmarking to new gradle
   targets = set()
-  targets.update(lower(run_benchmark.GOLEM_BUILD_TARGETS_OLD))
-  cmd = GRADLE_ARGS + [target for target in targets]
-  gradle.RunGradle(cmd)
-
-  targets = set()
-  targets.update(lower(run_benchmark.GOLEM_BUILD_TARGETS_NEW))
+  targets.update(lower(run_benchmark.GOLEM_BUILD_TARGETS))
   targets.update(lower(run_on_app_dump.GOLEM_BUILD_TARGETS))
   cmd = GRADLE_ARGS + [target for target in targets]
   gradle.RunGradle(cmd, new_gradle=True)

tools/run_benchmark.py

diff --git a/tools/run_benchmark.py b/tools/run_benchmark.py
index 1ac75c2..4a2b79b 100755
--- a/tools/run_benchmark.py
+++ b/tools/run_benchmark.py
@@ -13,6 +13,12 @@
 import jdk
 import utils
 
+GOLEM_BUILD_TARGETS_TESTS = [
+    utils.GRADLE_TASK_ALL_TESTS_WITH_APPLY_MAPPING_JAR,
+    utils.GRADLE_TASK_TEST_DEPS_JAR
+]
+GOLEM_BUILD_TARGETS = [utils.GRADLE_TASK_R8LIB] + GOLEM_BUILD_TARGETS_TESTS
+
 def get_golem_resource_path(benchmark):
   return os.path.join('benchmarks', benchmark)
 
@@ -77,11 +83,8 @@
     r8jar = utils.R8_JAR
     testjars = [utils.R8_TESTS_JAR, utils.R8_TESTS_DEPS_JAR]
   else:
-    testBuildTargets = [
-        utils.GRADLE_TASK_ALL_TESTS_WITH_APPLY_MAPPING_JAR,
-        utils.GRADLE_TASK_TEST_DEPS_JAR
-    ]
-    buildTargets = [utils.GRADLE_TASK_R8LIB] + testBuildTargets
+    testBuildTargets = GOLEM_BUILD_TARGETS_TESTS
+    buildTargets = GOLEM_BUILD_TARGETS
     r8jar = utils.R8LIB_JAR
     testjars = [
         os.path.join(utils.R8LIB_TESTS_JAR),