Include resource shrinker runtime dependencies for API tests
Change-Id: I1efa4d54669731e1074f9c2d168ff8b5d3ce74a1
diff --git a/d8_r8/test_modules/tests_java_8/build.gradle.kts b/d8_r8/test_modules/tests_java_8/build.gradle.kts
index 54aeb8e..613a7c2 100644
--- a/d8_r8/test_modules/tests_java_8/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/build.gradle.kts
@@ -34,14 +34,16 @@
val keepAnnoCompileTask = projectTask("keepanno", "compileJava")
val mainCompileTask = projectTask("main", "compileJava")
val mainDepsJarTask = projectTask("main", "depsJar")
+val resourceShrinkerJavaCompileTask = projectTask("resourceshrinker", "compileJava")
+val resourceShrinkerKotlinCompileTask = projectTask("resourceshrinker", "compileKotlin")
val resourceShrinkerDepsJarTask = projectTask("resourceshrinker", "depsJar")
dependencies {
implementation(keepAnnoJarTask.outputs.files)
implementation(mainCompileTask.outputs.files)
implementation(projectTask("main", "processResources").outputs.files)
- implementation(projectTask("resourceshrinker", "compileJava").outputs.files)
- implementation(projectTask("resourceshrinker", "compileKotlin").outputs.files)
+ implementation(resourceShrinkerJavaCompileTask.outputs.files)
+ implementation(resourceShrinkerKotlinCompileTask.outputs.files)
implementation(resourceShrinkerDepsJarTask.outputs.files)
implementation(Deps.asm)
implementation(Deps.asmCommons)
@@ -138,7 +140,9 @@
"R8_RUNTIME_PATH",
mainCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[0] +
File.pathSeparator + mainDepsJarTask.outputs.files.singleFile +
- File.pathSeparator + getRoot().resolveAll("src", "main", "resources"))
+ File.pathSeparator + getRoot().resolveAll("src", "main", "resources") +
+ File.pathSeparator + resourceShrinkerJavaCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[0] +
+ File.pathSeparator + resourceShrinkerKotlinCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[1])
systemProperty(
"RETRACE_RUNTIME_PATH",
mainCompileTask.outputs.files.getAsPath().split(File.pathSeparator)[0] +
