commit 145d9e87eb046d5ab504e4a0e428b745940997fb
author Søren Gjesse <sgjesse@google.com> Tue May 24 08:12:13 2022 +0200
committer Søren Gjesse <sgjesse@google.com> Tue May 24 07:32:49 2022 +0000
tree ab4aba18f38bd404cbb4b8d012c0813be8b93d27
parent 5890d7e5d7bf08a7b903e93c43bf5f9dcd146a3f

Only include the R8 license in the no-deps JARs

Change-Id: I681121932fabac1128dd3cd79511cb4ecf3b1fbd

build.gradle

diff --git a/build.gradle b/build.gradle
index 9981676..21a20be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -779,11 +779,16 @@
     archiveFileName = 'sources_main_11.jar'
 }
 
-def r8CreateTask(name, baseName, sources, includeSwissArmyKnife) {
+def r8CreateTask(name, baseName, sources, includeLibraryLicenses, includeSwissArmyKnife) {
     return tasks.create("r8Create${name}", Jar) {
         entryCompression ZipEntryCompression.STORED
         dependsOn sources
-        from consolidatedLicense.outputs.files
+        dependsOn files('LICENSE')
+        if (includeLibraryLicenses) {
+            from consolidatedLicense.outputs.files
+        } else {
+            from files('LICENSE')
+        }
         from sources.collect { zipTree(it) }
         exclude "$buildDir/classes/**"
         archiveFileName = baseName
@@ -844,6 +849,7 @@
             'WithDeps',
             'r8_with_deps.jar',
             repackageSources.outputs.files + repackageDeps.outputs.files,
+            true,
             true)
     dependsOn r8Task
     outputs.files r8Task.outputs.files
@@ -857,6 +863,7 @@
             'WithDeps11',
             'r8_with_deps_11.jar',
             repackageSources11.outputs.files + repackageDeps.outputs.files,
+            true,
             true)
     dependsOn r8Task
     outputs.files r8Task.outputs.files
@@ -883,6 +890,7 @@
             'WithoutDeps',
             'r8_without_deps.jar',
             repackageSources.outputs.files,
+            false,
             true)
     dependsOn r8Task
     outputs.files r8Task.outputs.files
@@ -905,6 +913,7 @@
             'NoManifestWithoutDeps',
             'r8_no_manifest_without_deps.jar',
             repackageSources.outputs.files,
+            false,
             false)
     dependsOn r8Task
     outputs.files r8Task.outputs.files
@@ -917,6 +926,7 @@
             'NoManifestWithDeps',
             'r8_no_manifest_with_deps.jar',
             repackageSources.outputs.files + repackageDeps.outputs.files,
+            true,
             false)
     dependsOn r8Task
     outputs.files r8Task.outputs.files