Version 1.0.16
Merge: Fix running of some tests
CL: https://r8-review.googlesource.com/c/r8/+/17721
(merge conflicts in R8RunArtTestsTest)
Change-Id: Ica2c01a293a8376bbb28d46930bb5e00b955109b
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 8442b2d..0927aa2 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
// This field is accessed from release scripts using simple pattern matching.
// Therefore, changing this field could break our release scripts.
- public static final String LABEL = "v1.0.15";
+ public static final String LABEL = "v1.0.16";
private Version() {
}
diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index 0ef4ef4..4cced77 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -146,9 +146,9 @@
// Desugaring of interface private methods is not yet supported.
.put("975-iface-private", AndroidApiLevel.N.getLevel())
// The extended check for overlapping long registers cause this to run out of registers.
- .put("421-large-frame", AndroidApiLevel.L.getLevel())
+ .put("421-large-frame", AndroidApiLevel.N.getLevel())
// The extended check for overlapping long registers cause this to run out of registers.
- .put("551-checker-shifter-operand", AndroidApiLevel.L.getLevel())
+ .put("551-checker-shifter-operand", AndroidApiLevel.N.getLevel())
.build();
// Tests that timeout when run with Art.
