commit 02961dac7d64e80a5309f874f2692fd3adf3a5aa
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Jun 15 13:56:32 2018 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Jun 15 13:56:32 2018 +0200
tree 1aae0d3c7b3dca12d3cf3942d1eb7bc42f47cf8a
parent a23190bcdfe7ff8e9b691b67f0e425d2c4092810

Update ProGuard config for MethodHandleTestRunner

The test implicitly assumes that MethodHandleTest$I is not merged into MethodHandleTest$Impl (due to the use of reflection).

Change-Id: Iae8d603bfd1227cbc334c9628eabd3a0b30dd3d2

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

diff --git a/src/test/java/com/android/tools/r8/cf/MethodHandleTestRunner.java b/src/test/java/com/android/tools/r8/cf/MethodHandleTestRunner.java
index 6069b4c..da32cce 100644
--- a/src/test/java/com/android/tools/r8/cf/MethodHandleTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/MethodHandleTestRunner.java
@@ -31,7 +31,6 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-
 @RunWith(Parameterized.class)
 public class MethodHandleTestRunner extends TestBase {
   static final Class<?> CLASS = MethodHandleTest.class;
@@ -169,7 +168,9 @@
           Arrays.asList(
               "-keep public class com.android.tools.r8.cf.MethodHandleTest {",
               "  public static void main(...);",
-              "}"),
+              "}",
+              // Disallow merging MethodHandleTest$I into MethodHandleTest$Impl
+              "-keep public interface com.android.tools.r8.cf.MethodHandleTest$I"),
           Origin.unknown());
     }
     try {