commit 92992fea1eb013a559e7ca6bf89d90847514f336
author Søren Gjesse <sgjesse@google.com> Fri Aug 30 14:04:22 2019 +0200
committer Søren Gjesse <sgjesse@google.com> Fri Aug 30 14:16:40 2019 +0000
tree d31e1ce2f021ef0447e6faf93827612cc816c96f
parent c9ca4b92e0c89e40153580dcaf6d32012459fb00

Build r8 without dependencies without dependencies

Pass the jar with dependencies as library not program when building
r8lib with external dependencies (r8lib-exclude-deps.jar).

Change-Id: I9bbf495db13891d0eba3c61b724202a082fed391

build.gradle

diff --git a/build.gradle b/build.gradle
index 23d3e0c..cdf2b9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -925,6 +925,7 @@
             ["src/main/keep.txt", "src/main/keep-applymapping.txt", genRulesTask.outputs.files[0]],
             R8NoManifestNoDeps,
             r8LibExludeDepsPath,
+            "--release",
             repackageDepsNoRelocate.outputs.files
     ).dependsOn(repackageDepsNoRelocate, genRulesTask)
     outputs.file r8LibExludeDepsPath

src/test/java/com/android/tools/r8/SanityCheck.java

diff --git a/src/test/java/com/android/tools/r8/SanityCheck.java b/src/test/java/com/android/tools/r8/SanityCheck.java
index be3b474..ef7d3c3 100644
--- a/src/test/java/com/android/tools/r8/SanityCheck.java
+++ b/src/test/java/com/android/tools/r8/SanityCheck.java
@@ -81,6 +81,7 @@
   @Test
   public void testLibJarsContent() throws Exception {
     checkLibJarContent(ToolHelper.R8LIB_JAR);
+    checkLibJarContent(ToolHelper.R8LIB_EXCLUDE_DEPS_JAR);
     checkLibJarContent(ToolHelper.COMPATDXLIB_JAR);
     checkLibJarContent(ToolHelper.COMPATPROGUARDLIB_JAR);
   }