commit 8224fbcd6a0175d7c44fec0d73f2697badc176cd
author Tamas Kenez <tamaskenez@google.com> Mon Dec 10 09:57:56 2018 +0100
committer Tamas Kenez <tamaskenez@google.com> Mon Dec 10 09:57:56 2018 +0100
tree 1324cf3d08d6832b5b4ea07e88a433fef8f3e004
parent 54b939a6e413cb13495d07d2b3c82688027298df

Build: don't put manifest into r8lib.

Bug: 120602748

Change-Id: Iaabf62d4744f6d752fd3765279577e394a2e2819

build.gradle

diff --git a/build.gradle b/build.gradle
index 2eba7a5..8e6084a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -569,6 +569,21 @@
     }
 }
 
+task R8NoManifest(type: ShadowJar) {
+    from consolidatedLicense.outputs.files
+    baseName 'r8nomanifest'
+    classifier = null
+    version = null
+    // In order to build without dependencies, pass the exclude_deps property using:
+    // gradle -Pexclude_deps R8
+    if (!project.hasProperty('exclude_deps')) {
+        from repackageSources.outputs.files
+        from repackageDeps.outputs.files
+    } else {
+        from sourceSets.main.output
+    }
+}
+
 task D8(type: ShadowJar) {
     from R8.outputs.files
     baseName 'd8'
@@ -606,10 +621,10 @@
 task R8Lib(type: Exec) {
     def pgconf = "src/main/keep.txt"
     def output = "build/libs/r8lib.jar"
-    inputs.files files(pgconf, R8.outputs)
+    inputs.files files(pgconf, R8.outputs, R8NoManifest.outputs)
     outputs.file output
     dependsOn downloadOpenJDKrt
-    commandLine r8CfCommandLine(R8.outputs.files[0], output, pgconf)
+    commandLine r8CfCommandLine(R8NoManifest.outputs.files[0], output, pgconf)
     workingDir = projectDir
 }
 
@@ -619,7 +634,7 @@
     inputs.files files(pgconf, CompatDx.outputs, R8.outputs)
     outputs.file output
     dependsOn downloadOpenJDKrt
-    commandLine r8CfCommandLine(R8.outputs.files[0], output, pgconf)
+    commandLine r8CfCommandLine(CompatDx.outputs.files[0], output, pgconf)
     workingDir = projectDir
 }
 
@@ -629,7 +644,7 @@
     inputs.files files(pgconf, CompatProguard.outputs, R8.outputs)
     outputs.file output
     dependsOn downloadOpenJDKrt
-    commandLine r8CfCommandLine(R8.outputs.files[0], output, pgconf)
+    commandLine r8CfCommandLine(CompatProguard.outputs.files[0], output, pgconf)
     workingDir = projectDir
 }
 

tools/archive.py

diff --git a/tools/archive.py b/tools/archive.py
index aa3d22d..65f87a1 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -84,7 +84,7 @@
 
   # Generate an r8-ed build without dependencies.
   # Note: build_r8lib does a gradle-clean, this must be the first command.
-  build_r8lib('r8', True, True, utils.R8LIB_KEEP_RULES,
+  build_r8lib('r8nomanifest', True, True, utils.R8LIB_KEEP_RULES,
     utils.R8LIB_EXCLUDE_DEPS_JAR)
 
   # Create maven release which uses a build that exclude dependencies.