Fix testR8LibCompatibility by renaming dependency jar
Change-Id: Ie5bbb67e5a4da1945732c822762d9b0fb6497515
diff --git a/tools/test.py b/tools/test.py
index 257e88c..f4cee88 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -123,9 +123,6 @@
if utils.is_bot():
gradle.RunGradle(['clean'])
- # Build an R8 with dependencies for bootstrapping tests before adding test sources
- gradle.RunGradle(['r8WithRelocatedDeps'])
-
gradle_args = ['--stacktrace']
# Set all necessary Gradle properties and options first.
if options.verbose:
@@ -182,9 +179,15 @@
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')
if options.r8lib_no_deps:
gradle_args.append('-Pr8lib_no_deps')
+ # Build an R8 with dependencies for bootstrapping tests before adding test sources.
+ gradle_args.append('r8WithRelocatedDeps')
+
# Add Gradle tasks
gradle_args.append('cleanTest')
gradle_args.append('test')
