commit 88643cc103ff51fea170ce5cede7188ac3d682e0
author Mikaël Peltier <mikaelpeltier@google.com> Tue May 23 11:33:40 2017 +0200
committer Mikaël Peltier <mikaelpeltier@google.com> Tue May 23 11:33:40 2017 +0200
tree 802c6871ce67fa70c7a6654b040ec1df2ebf7543
parent b462c6ed314fbf3f80e6c63b1d8853365033563a

Enable to run default method tests on Pre-N runtime

Change-Id: I81818f018547feb89fbc340f3b2c84c5d6844f34

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

diff --git a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidNTest.java b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidNTest.java
index 1335970..c4b13d9 100644
--- a/src/test/java/com/android/tools/r8/R8RunExamplesAndroidNTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunExamplesAndroidNTest.java
@@ -35,17 +35,11 @@
   private static Map<DexVm, List<String>> failsOn =
       ImmutableMap.of(
           DexVm.ART_4_4_4,
-          ImmutableList.of(
-              // Dex version not supported
-              "staticinterfacemethods", "defaultmethods"),
+          ImmutableList.of(),
           DexVm.ART_5_1_1,
-          ImmutableList.of(
-              // Dex version not supported
-              "staticinterfacemethods", "defaultmethods"),
+          ImmutableList.of(),
           DexVm.ART_6_0_1,
-          ImmutableList.of(
-              // Dex version not supported
-              "staticinterfacemethods", "defaultmethods"),
+          ImmutableList.of(),
           DexVm.ART_7_0_0,
           ImmutableList.of(),
           DexVm.ART_DEFAULT,
@@ -61,7 +55,7 @@
         "staticinterfacemethods",
         "interfacemethods",
         "StaticInterfaceMethods",
-        Constants.ANDROID_N_API,
+        Constants.ANDROID_K_API,
         options -> options.interfaceMethodDesugaring = OffOrAuto.Auto);
   }
 
@@ -80,7 +74,7 @@
         "defaultmethods",
         "interfacemethods",
         "DefaultMethods",
-        Constants.ANDROID_N_API,
+        Constants.ANDROID_K_API,
         options -> options.interfaceMethodDesugaring = OffOrAuto.Auto);
   }