commit 0edb426308e3e3a2a251cdb0b79bcc60bd6fff8b
author Rico Wind <ricow@google.com> Tue May 23 09:16:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 23 09:16:05 2017 +0000
tree e2d9fc472c41ffe0086f0a0e20d93e23254ab92a
parent 3c873f87325f6a19b55fb424bed7b61229037347
parent 33f4a575126d5c9599282cc68fcc5673c86f0b95

Merge "Update incremental dexing benchmark to follow our normal output style"

build.gradle

diff --git a/build.gradle b/build.gradle
index 8eb9643..ebebe33 100644
--- a/build.gradle
+++ b/build.gradle
@@ -164,6 +164,16 @@
     }
 }
 
+task downloadProguard {
+    cloudDependencies.each { entry ->
+        entry.value.each { entryFile ->
+            if (entryFile.contains("proguard")) {
+                dependsOn "download_deps_${entry.key}/${entryFile}"
+            }
+        }
+    }
+}
+
 task downloadDeps {
     cloudDependencies.each { entry ->
         entry.value.each { entryFile ->
@@ -362,7 +372,7 @@
 }
 
 task buildExampleJars {
-    dependsOn downloadDeps
+    dependsOn downloadProguard
     def examplesDir = file("src/test/examples")
     def proguardScript = "third_party/proguard/proguard5.2.1/bin/proguard.sh"
     task "compile_examples"(type: JavaCompile) {

src/test/java/com/android/tools/r8/classmerging/ClassMergingTest.java

diff --git a/src/test/java/com/android/tools/r8/classmerging/ClassMergingTest.java b/src/test/java/com/android/tools/r8/classmerging/ClassMergingTest.java
index 2326eb5..0d0d6f0 100644
--- a/src/test/java/com/android/tools/r8/classmerging/ClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/ClassMergingTest.java
@@ -35,7 +35,10 @@
             .addProgramFiles(EXAMPLE_JAR)
             .addProguardConfigurationFiles(EXAMPLE_KEEP)
             .setMinification(false)
-            .build(), o -> o.allowAccessModification = false);
+            .build(), o -> {
+          o.allowAccessModification = false;
+          o.skipClassMerging = false;
+        });
     inspector = new DexInspector(
         Paths.get(temp.getRoot().getCanonicalPath()).resolve("classes.dex"));
   }