commit 764f23af5c6f8adaf96855a4cb1e3731a73a9266
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Dec 10 15:47:11 2018 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Dec 10 15:47:11 2018 +0100
tree eb2767d9c16669d49392470d9603ff1b815ccde4
parent a730a7ec7dcf2a396c23df085ef35df74cf05707

Clean up name and rule for generating r8 with dependencies

Change-Id: I1ef23299e496061b7ef2e4286475e43715525d67

build.gradle

diff --git a/build.gradle b/build.gradle
index 33605a1..b4dc7ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -529,15 +529,6 @@
     baseName 'deps'
 }
 
-task repackageDepsForLib(type: ShadowJar) {
-    configurations = [project.configurations.runtimeClasspath]
-    mergeServiceFiles(it)
-    configureRelocations(it)
-    exclude { it.getRelativePath().getPathString() == "module-info.class" }
-    exclude { it.getRelativePath().getPathString().startsWith("META-INF/maven/") }
-    baseName 'r8lib_deps'
-}
-
 task repackageSources(type: ShadowJar) {
     from sourceSets.main.output
     mergeServiceFiles(it)
@@ -547,16 +538,19 @@
     baseName 'sources'
 }
 
-task R8libWithDeps(type: ShadowJar) {
+task r8WithRelocatedDeps(type: ShadowJar) {
     from consolidatedLicense.outputs.files
-    baseName 'r8lib_with_deps'
+    baseName 'r8_with_relocated_deps'
     classifier = null
     version = null
     manifest {
         attributes 'Main-Class': 'com.android.tools.r8.SwissArmyKnife'
     }
     from repackageSources.outputs.files
-    from repackageDepsForLib.outputs.files
+    from repackageDeps.outputs.files
+    doLast {
+        configureRelocations(it)
+    }
 }
 
 task R8(type: ShadowJar) {

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

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 4f8b2e3..a7d6e40 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -111,7 +111,8 @@
   private static final String RETRACE = RETRACE6_0_1;
 
   public static final Path R8_JAR = Paths.get(LIBS_DIR, "r8.jar");
-  public static final Path R8_LIB_JAR = Paths.get(LIBS_DIR, "r8lib_with_deps.jar");
+  public static final Path R8_WITH_RELOCATED_DEPS_JAR =
+      Paths.get(LIBS_DIR, "r8_with_relocated_deps.jar");
 
   public enum DexVm {
     ART_4_0_4_TARGET(Version.V4_0_4, Kind.TARGET),

src/test/java/com/android/tools/r8/cf/BootstrapCurrentEqualityTest.java

diff --git a/src/test/java/com/android/tools/r8/cf/BootstrapCurrentEqualityTest.java b/src/test/java/com/android/tools/r8/cf/BootstrapCurrentEqualityTest.java
index 9824d39..a651163 100644
--- a/src/test/java/com/android/tools/r8/cf/BootstrapCurrentEqualityTest.java
+++ b/src/test/java/com/android/tools/r8/cf/BootstrapCurrentEqualityTest.java
@@ -84,8 +84,8 @@
     if (testExternal) {
       R8Result output =
           runExternalR8(
-              ToolHelper.R8_LIB_JAR,
-              ToolHelper.R8_LIB_JAR,
+              ToolHelper.R8_WITH_RELOCATED_DEPS_JAR,
+              ToolHelper.R8_WITH_RELOCATED_DEPS_JAR,
               testFolder.newFolder().toPath(),
               MAIN_KEEP,
               mode);
@@ -96,7 +96,7 @@
           R8Command.builder()
               .setMode(CompilationMode.RELEASE)
               .addLibraryFiles(runtimeJar(Backend.CF))
-              .addProgramFiles(ToolHelper.R8_LIB_JAR)
+              .addProgramFiles(ToolHelper.R8_WITH_RELOCATED_DEPS_JAR)
               .setOutput(jar, OutputMode.ClassFile)
               .build());
     }
@@ -114,10 +114,20 @@
   private void compareR8(Path program, ProcessResult runResult, String[] keep, String... args)
       throws Exception {
     R8Result runR8Debug =
-        runExternalR8(ToolHelper.R8_LIB_JAR, program, temp.newFolder().toPath(), keep, "--debug");
+        runExternalR8(
+            ToolHelper.R8_WITH_RELOCATED_DEPS_JAR,
+            program,
+            temp.newFolder().toPath(),
+            keep,
+            "--debug");
     assertEquals(runResult.toString(), ToolHelper.runJava(runR8Debug.outputJar, args).toString());
     R8Result runR8Release =
-        runExternalR8(ToolHelper.R8_LIB_JAR, program, temp.newFolder().toPath(), keep, "--release");
+        runExternalR8(
+            ToolHelper.R8_WITH_RELOCATED_DEPS_JAR,
+            program,
+            temp.newFolder().toPath(),
+            keep,
+            "--release");
     assertEquals(runResult.toString(), ToolHelper.runJava(runR8Release.outputJar, args).toString());
     RunR8AndCheck(r8R8Debug, program, runR8Debug, keep, "--debug");
     RunR8AndCheck(r8R8Debug, program, runR8Release, keep, "--release");

tools/test.py

diff --git a/tools/test.py b/tools/test.py
index 0e4625f..279f58b 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -120,8 +120,8 @@
   if utils.is_bot():
     gradle.RunGradle(['clean'])
 
-  # Build R8lib with dependencies for bootstrapping tests before adding test sources
-  gradle.RunGradle(['r8libwithdeps'])
+  # Build an R8 with dependencies for bootstrapping tests before adding test sources
+  gradle.RunGradle(['r8WithRelocatedDeps'])
 
   gradle_args = ['--stacktrace']
   # Set all necessary Gradle properties and options first.