Fix keepanno annotations build
Make seperate target for the jar with only the annotations
Bug: 301573288
Change-Id: I4f6285fb0aad495eb201fdefcb11d13aa1ef65ca
diff --git a/d8_r8/keepanno/build.gradle.kts b/d8_r8/keepanno/build.gradle.kts
index 9d4a18e..376472a 100644
--- a/d8_r8/keepanno/build.gradle.kts
+++ b/d8_r8/keepanno/build.gradle.kts
@@ -10,7 +10,6 @@
java {
sourceSets.main.configure {
java.srcDir(getRoot().resolveAll("src", "keepanno", "java"))
- java.include("com/android/tools/r8/keepanno/annotations/*.java")
}
sourceCompatibility = JvmCompatibility.sourceCompatibility
targetCompatibility = JvmCompatibility.targetCompatibility
@@ -23,10 +22,16 @@
}
tasks {
+ val keepAnnoAnnotationsJar by registering(Jar::class) {
+ dependsOn(gradle.includedBuild("shared").task(":downloadDeps"))
+ from(sourceSets.main.get().output)
+ include("com/android/tools/r8/keepanno/annotations/*")
+ destinationDirectory.set(getRoot().resolveAll("build", "libs"))
+ archiveFileName.set("keepanno-annotations.jar")
+ }
+
val keepAnnoJar by registering(Jar::class) {
dependsOn(gradle.includedBuild("shared").task(":downloadDeps"))
from(sourceSets.main.get().output)
- destinationDirectory.set(getRoot().resolveAll("build", "libs"))
- archiveFileName.set("keepanno-annotations.jar")
}
}
diff --git a/tools/archive.py b/tools/archive.py
index 8b136ec..ce558e9 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -174,7 +174,7 @@
if (not options.skip_gradle_build):
if (new_gradle):
gradle.RunGradle([
- ':keepanno:keepAnnoJar',
+ ':keepanno:keepAnnoAnnotationsJar',
':main:consolidatedLicense',
':main:r8WithRelocatedDeps',
':main:swissArmyKnife',
