Fix bootstrap tests for usage with testbase
Bug: 327326057
Change-Id: Iec4385d80aa95a73cc989b264353995624811255
diff --git a/d8_r8/test_modules/tests_bootstrap/build.gradle.kts b/d8_r8/test_modules/tests_bootstrap/build.gradle.kts
index 2b3af66..0be47ab 100644
--- a/d8_r8/test_modules/tests_bootstrap/build.gradle.kts
+++ b/d8_r8/test_modules/tests_bootstrap/build.gradle.kts
@@ -25,6 +25,9 @@
targetCompatibility = JavaVersion.VERSION_1_8
}
+val testbaseJavaCompileTask = projectTask("testbase", "compileJava")
+val testbaseDepsJarTask = projectTask("testbase", "depsJar")
+
val testsJava8Jar = projectTask("tests_java_8", "testJar")
val keepAnnoJarTask = projectTask("keepanno", "jar")
val keepAnnoCompileTask = projectTask("keepanno", "compileJava")
@@ -40,14 +43,8 @@
implementation(resourceShrinkerJavaCompileTask.outputs.files)
implementation(resourceShrinkerKotlinCompileTask.outputs.files)
implementation(resourceShrinkerDepsJarTask.outputs.files)
- implementation(Deps.asm)
- implementation(Deps.asmCommons)
- implementation(Deps.asmUtil)
- implementation(Deps.gson)
- implementation(Deps.guava)
- implementation(Deps.junit)
- implementation(Deps.kotlinMetadata)
- implementation(Deps.fastUtil)
+ implementation(testbaseDepsJarTask.outputs.files)
+ implementation(testbaseJavaCompileTask.outputs.files)
}
fun testDependencies() : FileCollection {
diff --git a/d8_r8/test_modules/tests_bootstrap/settings.gradle.kts b/d8_r8/test_modules/tests_bootstrap/settings.gradle.kts
index b79b3eb..5f5d322 100644
--- a/d8_r8/test_modules/tests_bootstrap/settings.gradle.kts
+++ b/d8_r8/test_modules/tests_bootstrap/settings.gradle.kts
@@ -32,3 +32,4 @@
includeBuild(root.resolve("test_modules").resolve("tests_java_8"))
includeBuild(root.resolve("keepanno"))
includeBuild(root.resolve("resourceshrinker"))
+includeBuild(root.resolve("test_modules").resolve("testbase"))
