Switch golem over to use new gradle except test benchmark target
Bug: b/302999071
Bug: b/300387869
Change-Id: I9e1791a4430d2f076419ebcb89cf76e6a962e7d1
diff --git a/tools/golem_build.py b/tools/golem_build.py
index 4f668d6..1cbf39f 100755
--- a/tools/golem_build.py
+++ b/tools/golem_build.py
@@ -17,11 +17,17 @@
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))
- targets.update(lower(run_on_app_dump.GOLEM_BUILD_TARGETS))
+ 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_on_app_dump.GOLEM_BUILD_TARGETS))
+ cmd = GRADLE_ARGS + [target for target in targets]
+ gradle.RunGradle(cmd, new_gradle=True)
+
if __name__ == '__main__':
sys.exit(Main())
