Version 1.6.66
Backport VerticalClassMergerInvokeSpecialInConstructorTest test to old
test interface.
Bug: 148313389
Change-Id: I1c8b757fe669fb01c8519b1797e46d790d088280
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 713df62..6f2d5c3 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 = "1.6.65";
+ public static final String LABEL = "1.6.66";
private Version() {
}
diff --git a/src/test/java/com/android/tools/r8/shaking/VerticalClassMergerInvokeSpecialInConstructorTest.java b/src/test/java/com/android/tools/r8/shaking/VerticalClassMergerInvokeSpecialInConstructorTest.java
index c1d8993..89327a5 100644
--- a/src/test/java/com/android/tools/r8/shaking/VerticalClassMergerInvokeSpecialInConstructorTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/VerticalClassMergerInvokeSpecialInConstructorTest.java
@@ -36,7 +36,7 @@
@Test
public void testRuntime() throws IOException, CompilationFailedException, ExecutionException {
- testForRuntime(parameters)
+ testForRuntime(parameters.getRuntime(), parameters.getApiLevel())
.addInnerClasses(VerticalClassMergerInvokeSpecialInConstructorTest.class)
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
@@ -48,7 +48,7 @@
.addInnerClasses(VerticalClassMergerInvokeSpecialInConstructorTest.class)
.addKeepMainRule(Main.class)
.addKeepClassRules(A.class)
- .enableNeverClassInliningAnnotations()
+ .enableClassInliningAnnotations()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines(EXPECTED);
