Fix r8lib dependencies on java test examples

Bug: b/270105162
Change-Id: I8954ba71a458e159e88c5dcf151d482d0642c213

d8_r8/test/build.gradle.kts

diff --git a/d8_r8/test/build.gradle.kts b/d8_r8/test/build.gradle.kts
index b7fd7b5..82eae1f 100644
--- a/d8_r8/test/build.gradle.kts
+++ b/d8_r8/test/build.gradle.kts
@@ -30,6 +30,7 @@
 val java8TestJarTask = projectTask("tests_java_8", "testJar")
 val java8TestsDepsJarTask = projectTask("tests_java_8", "depsJar")
 val bootstrapTestsDepsJarTask = projectTask("tests_bootstrap", "depsJar")
+val testsJava8SourceSetDependenciesTask = projectTask("tests_java_8", "sourceSetDependencyTask")
 
 tasks {
   withType<Exec> {
@@ -286,6 +287,7 @@
     if (!project.hasProperty("no_internal")) {
       dependsOn(gradle.includedBuild("shared").task(":downloadDepsInternal"))
     }
+    dependsOn(testsJava8SourceSetDependenciesTask)
     val r8LibJar = r8LibWithRelocatedDeps.get().outputs.files.singleFile
     this.configure(isR8Lib = true, r8Jar = r8LibJar)
 

d8_r8/test_modules/tests_java_8/build.gradle.kts

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 881089b..d46599a 100644
--- a/d8_r8/test_modules/tests_java_8/build.gradle.kts
+++ b/d8_r8/test_modules/tests_java_8/build.gradle.kts
@@ -94,6 +94,10 @@
     enabled = false
   }
 
+  val sourceSetDependencyTask by registering {
+    dependsOn(*sourceSetDependenciesTasks)
+  }
+
   withType<Test> {
     TestingState.setUpTestingState(this)
     dependsOn(mainDepsJarTask)
@@ -101,7 +105,7 @@
     if (!project.hasProperty("no_internal")) {
       dependsOn(gradle.includedBuild("shared").task(":downloadDepsInternal"))
     }
-    dependsOn(*sourceSetDependenciesTasks)
+    dependsOn(sourceSetDependencyTask)
     systemProperty("TEST_DATA_LOCATION",
                    layout.buildDirectory.dir("classes/java/test").get().toString())
     systemProperty("KEEP_ANNO_JAVAC_BUILD_DIR", keepAnnoCompileTask.outputs.files.getAsPath())