commit 3c873f87325f6a19b55fb424bed7b61229037347
author Rico Wind <ricow@google.com> Tue May 23 08:51:48 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 23 08:51:48 2017 +0000
tree 65aa6411d53c362a2109b59899e05b9175bf1164
parent 10965b2ac1f6744f196c1146b676d15b72549c82
parent 897bb7199a6625c903a470375bd82fbdd9f7e946

Merge "Only rely on downloading proguard for building our examples"

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"));
   }