commit 34f8064110ee4278d4dd0dbd79d245b2cc3c0dad
author Rico Wind <ricow@google.com> Thu Sep 14 10:45:17 2023 +0200
committer Rico Wind <ricow@google.com> Thu Sep 14 10:44:12 2023 +0000
tree 8de528e7ef42eb2348e0134f3eb2068dd413a72e
parent d6323aded01cc990d673cd898c36ebce2ea1092d

Include keepanno and resource shrinker in R8 jar(s)

Change-Id: I41314f12bc94df31eb1c2a5b16dbc7b8655721a4

d8_r8/main/build.gradle.kts

diff --git a/d8_r8/main/build.gradle.kts b/d8_r8/main/build.gradle.kts
index bec7b28..5ddc69a 100644
--- a/d8_r8/main/build.gradle.kts
+++ b/d8_r8/main/build.gradle.kts
@@ -123,7 +123,11 @@
   }
 
   val swissArmyKnife by registering(Jar::class) {
+    dependsOn(keepAnnoJarTask)
+    dependsOn(resourceShrinkerJarTask)
     from(sourceSets.main.get().output)
+    from(keepAnnoJarTask.outputs.files.map(::zipTree))
+    from(resourceShrinkerJarTask.outputs.files.map(::zipTree))
     from(consolidatedLicense)
     manifest {
       attributes["Main-Class"] = "com.android.tools.r8.SwissArmyKnife"
@@ -134,12 +138,8 @@
   }
 
   val depsJar by registering(Jar::class) {
-    dependsOn(keepAnnoJarTask)
-    dependsOn(resourceShrinkerJarTask)
     dependsOn(resourceShrinkerDepsTask)
     from(mainJarDependencies().map(::zipTree))
-    from(keepAnnoJarTask.outputs.files.map(::zipTree))
-    from(resourceShrinkerJarTask.outputs.files.map(::zipTree))
     from(resourceShrinkerDepsTask.outputs.files.map(::zipTree))
     exclude("**/module-info.class")
     exclude("**/*.kotlin_metadata")

d8_r8/test/build.gradle.kts

diff --git a/d8_r8/test/build.gradle.kts b/d8_r8/test/build.gradle.kts
index 5865f99..d73a82d 100644
--- a/d8_r8/test/build.gradle.kts
+++ b/d8_r8/test/build.gradle.kts
@@ -22,7 +22,7 @@
 
 val keepAnnoCompileTask = projectTask("keepanno", "compileJava")
 val mainDepsJarTask = projectTask("main", "depsJar")
-val r8Jar = projectTask("main", "jar")
+val swissArmyKnifeTask = projectTask("main", "swissArmyKnife")
 val r8WithRelocatedDepsTask = projectTask("main", "r8WithRelocatedDeps")
 val java8TestJarTask = projectTask("tests_java_8", "testJar")
 val java8TestsDepsJarTask = projectTask("tests_java_8", "depsJar")
@@ -91,7 +91,7 @@
     dependsOn(mainDepsJarTask)
     dependsOn(r8WithRelocatedDepsTask)
     val r8Compiler = r8WithRelocatedDepsTask.outputs.files.getSingleFile()
-    val r8Jar = r8Jar.outputs.files.getSingleFile()
+    val r8Jar = swissArmyKnifeTask.outputs.files.getSingleFile()
     val deps = mainDepsJarTask.outputs.files.getSingleFile()
     inputs.files(listOf(r8Compiler, r8Jar, deps))
     val output = file(Paths.get("build", "libs", "r8lib-exclude-deps.jar"))
@@ -276,4 +276,4 @@
       dependsOn(gradle.includedBuild("tests_bootstrap").task(":test"))
     }
   }
-}
\ No newline at end of file
+}