Fix test.py for new gradle with r8lib
Change-Id: Ied80f15749f4ae68016f07e3105fd05749ddbd30
diff --git a/tools/test.py b/tools/test.py
index 34252ea..4e518d7 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -342,10 +342,14 @@
exit(1)
if not options.no_r8lib:
gradle_args.append('-Pr8lib')
- # Force gradle to build a version of r8lib without dependencies for
- # BootstrapCurrentEqualityTest.
- gradle_args.append('R8LibNoDeps')
- gradle_args.append('R8Retrace')
+ if options.new_gradle:
+ gradle_args.append(':test:r8LibNoDeps')
+ gradle_args.append(':test:retraceWithRelocatedDeps')
+ else:
+ # Force gradle to build a version of r8lib without dependencies for
+ # BootstrapCurrentEqualityTest.
+ gradle_args.append('R8LibNoDeps')
+ gradle_args.append('R8Retrace')
if options.r8lib_no_deps:
gradle_args.append('-Pr8lib_no_deps')
if options.worktree:
