Use setMinApi and remove setMinApiForRuntime.
Change-Id: Ic0031e68313775619f9e7b19d7ce3ed561b4b7a0
diff --git a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
index 7014cff..111bc20 100644
--- a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -128,6 +128,13 @@
return setMinApi(minApi);
}
+ public T setMinApiThreshold(TestRuntime runtime) {
+ if (runtime.isDex()) {
+ setMinApiThreshold(runtime.asDex().getMinApiLevel());
+ }
+ return self();
+ }
+
public T setMinApi(AndroidApiLevel minApiLevel) {
if (backend == Backend.DEX) {
this.defaultMinApiLevel = null;
@@ -138,7 +145,7 @@
public T setMinApi(TestRuntime runtime) {
if (runtime.isDex()) {
- setMinApi(ToolHelper.getMinApiLevelForDexVm(runtime.asDex().getVm()));
+ setMinApi(runtime.asDex().getMinApiLevel());
}
return self();
}
diff --git a/src/test/java/com/android/tools/r8/TestParameters.java b/src/test/java/com/android/tools/r8/TestParameters.java
index 041c33e..1c0b755 100644
--- a/src/test/java/com/android/tools/r8/TestParameters.java
+++ b/src/test/java/com/android/tools/r8/TestParameters.java
@@ -38,10 +38,4 @@
public String toString() {
return runtime.toString();
}
-
- public void setMinApiForRuntime(TestCompilerBuilder<?, ?, ?, ?, ?> builder) {
- if (runtime.isDex()) {
- builder.setMinApi(runtime.asDex().getMinApiLevel());
- }
- }
}
diff --git a/src/test/java/com/android/tools/r8/cf/KeepDeserializeLambdaMethodTestRunner.java b/src/test/java/com/android/tools/r8/cf/KeepDeserializeLambdaMethodTestRunner.java
index c2dc7b7..6ecb4de 100644
--- a/src/test/java/com/android/tools/r8/cf/KeepDeserializeLambdaMethodTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/KeepDeserializeLambdaMethodTestRunner.java
@@ -58,7 +58,7 @@
testForR8Compat(parameters.getBackend())
.addProgramClasses(
com.android.tools.r8.cf.KeepDeserializeLambdaMethodTest.class, testClass)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addKeepMainRule(testClass)
.noMinification();
if (keepRule) {
diff --git a/src/test/java/com/android/tools/r8/internal/Regression127524985.java b/src/test/java/com/android/tools/r8/internal/Regression127524985.java
index 7de4078..5fb64ea 100644
--- a/src/test/java/com/android/tools/r8/internal/Regression127524985.java
+++ b/src/test/java/com/android/tools/r8/internal/Regression127524985.java
@@ -52,7 +52,7 @@
.addKeepAllAttributes()
.addKeepRules("-dontwarn *"))
.addProgramFiles(JAR)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.compile()
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizationTest.java
index eb679f8..27cd963 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/IdempotentFunctionCallCanonicalizationTest.java
@@ -152,7 +152,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, EXPECTED_BOOLEAN_VALUE_OF, EXPECTED_INTEGER_VALUE_OF, EXPECTED_LONG_VALUE_OF);
@@ -161,7 +161,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, EXPECTED_BOOLEAN_VALUE_OF, EXPECTED_INTEGER_VALUE_OF, EXPECTED_LONG_VALUE_OF);
@@ -174,7 +174,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
int expectedBooleanValueOfCount =
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningInvokeSuperTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningInvokeSuperTest.java
index 7d76b0f..b5109d6 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningInvokeSuperTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningInvokeSuperTest.java
@@ -40,7 +40,7 @@
.enableClassInliningAnnotations()
.enableInliningAnnotations()
.enableMergeAnnotations()
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java
index 892a096..48d3203 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineLibraryInterfaceMethodTest.java
@@ -45,7 +45,7 @@
testForR8(Backend.DEX)
.addInnerClasses(InlineLibraryInterfaceMethodTest.class)
.addKeepMainRule(TestClass.class)
- .setMinApi(testRuntime.asDex().getMinApiLevel())
+ .setMinApi(testRuntime)
.noMinification()
.run(testRuntime, TestClass.class)
.assertSuccess()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassTest.java
index f894cc8..8854018 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassTest.java
@@ -201,7 +201,7 @@
testForD8()
.debug()
.addProgramClassesAndInnerClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 6, 0, 1, 0);
@@ -211,7 +211,7 @@
testForD8()
.release()
.addProgramClassesAndInnerClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 6, 0, 1, 0);
@@ -228,7 +228,7 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.noMinification()
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN);
test(result, 5, 1, 1, 0);
@@ -240,7 +240,7 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.noMinification()
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 0, 7, 0, 1);
@@ -252,7 +252,7 @@
.enableProguardTestOptions()
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
// We are not checking output because it can't be matched due to minification. Just run.
.run(parameters.getRuntime(), MAIN);
test(result, 0, 7, 0, 1);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameInClassInitializerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameInClassInitializerTest.java
index c1d8055..4472ef6 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameInClassInitializerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameInClassInitializerTest.java
@@ -72,7 +72,7 @@
.addKeepRules("-keep class **.GetNameClinit*")
.minification(enableMinification);
builder
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -91,7 +91,7 @@
R8TestRunResult result =
builder
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN);
result.assertSuccessWithOutput(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java
index 92808f9..4bdcb96 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetNameTest.java
@@ -245,7 +245,7 @@
testForD8()
.debug()
.addProgramFiles(classPaths)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -255,7 +255,7 @@
testForD8()
.release()
.addProgramFiles(classPaths)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -275,7 +275,7 @@
.addKeepRules("-keepattributes InnerClasses,EnclosingMethod")
.addKeepRules("-printmapping " + createNewMappingPath().toAbsolutePath().toString())
.minification(enableMinification)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -294,7 +294,7 @@
.addKeepRules("-keepattributes InnerClasses,EnclosingMethod")
.addKeepRules("-printmapping " + createNewMappingPath().toAbsolutePath().toString())
.minification(enableMinification)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN);
if (enableMinification) {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java
index 7ef7711..45f0ee7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetSimpleNameTest.java
@@ -192,7 +192,7 @@
testForD8()
.debug()
.addProgramFiles(classPaths)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -202,7 +202,7 @@
testForD8()
.release()
.addProgramFiles(classPaths)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -222,7 +222,7 @@
.addKeepRules("-keepattributes InnerClasses,EnclosingMethod")
.addKeepRules("-printmapping " + createNewMappingPath().toAbsolutePath().toString())
.minification(enableMinification)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
@@ -245,7 +245,7 @@
.addKeepRules("-keepattributes InnerClasses,EnclosingMethod")
.addKeepRules("-printmapping " + createNewMappingPath().toAbsolutePath().toString())
.minification(enableMinification)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN);
if (enableMinification) {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/NestedStringBuilderTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/NestedStringBuilderTest.java
index f283943..4d05918 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/NestedStringBuilderTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/NestedStringBuilderTest.java
@@ -68,7 +68,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.compile();
test(result);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringCanonicalizationTest.java
index 2029e44..1eb5649 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringCanonicalizationTest.java
@@ -209,7 +209,7 @@
testForD8()
.release()
.addProgramClassesAndInnerClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.compile();
test(result, 1, 1, 1, 1, 1);
@@ -217,7 +217,7 @@
testForD8()
.debug()
.addProgramClassesAndInnerClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.compile();
test(result, 2, 1, 1, 1, 1);
}
@@ -230,7 +230,7 @@
.enableProguardTestOptions()
.enableInliningAnnotations()
.addKeepMainRule(MessageLoader.class)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.compile();
test(result, 1, 1, 1, 1, 1);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatenationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatenationTest.java
index ee2eb02..e0811eb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatenationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringConcatenationTest.java
@@ -124,7 +124,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 3, 4);
@@ -133,7 +133,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
// TODO(b/114002137): could be 1 and 3.
@@ -147,7 +147,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.noMinification()
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringContentCheckTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringContentCheckTest.java
index f4116c0..9b77cbc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringContentCheckTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringContentCheckTest.java
@@ -246,7 +246,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 31);
@@ -255,7 +255,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 16);
@@ -268,7 +268,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 16);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringInMonitorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringInMonitorTest.java
index dec193f..833f2dc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringInMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringInMonitorTest.java
@@ -184,7 +184,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 2, 2, 1);
@@ -193,7 +193,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 2, 2, 1);
@@ -206,7 +206,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
// Due to the different behavior regarding constant canonicalization.
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringIsEmptyTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringIsEmptyTest.java
index df13a22..fba4ced 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringIsEmptyTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringIsEmptyTest.java
@@ -122,7 +122,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 3);
@@ -131,7 +131,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 1);
@@ -145,7 +145,7 @@
.enableProguardTestOptions()
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 1);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java
index d8ef399..2d0bdea 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringLengthTest.java
@@ -154,7 +154,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN);
// TODO(b/119097175)
if (!ToolHelper.isWindows()) {
@@ -166,7 +166,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN);
// TODO(b/119097175)
if (!ToolHelper.isWindows()) {
@@ -182,7 +182,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN);
// TODO(b/119097175)
if (!ToolHelper.isWindows()) {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringToStringTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringToStringTest.java
index de13f58..ea664a8 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringToStringTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringToStringTest.java
@@ -114,7 +114,7 @@
testForD8()
.debug()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 1);
@@ -123,7 +123,7 @@
testForD8()
.release()
.addProgramClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 0);
@@ -136,7 +136,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.noMinification()
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java
index 67eb8de..1e9b3f4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringValueOfTest.java
@@ -202,7 +202,7 @@
testForD8()
.debug()
.addProgramClassesAndInnerClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 7, 1, 0);
@@ -211,7 +211,7 @@
testForD8()
.release()
.addProgramClassesAndInnerClasses(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 5, 1, 1);
@@ -224,7 +224,7 @@
.addProgramClassesAndInnerClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.noMinification()
.addOptionsModification(this::configure)
.run(parameters.getRuntime(), MAIN)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/desugar/DefaultInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/desugar/DefaultInterfaceMethodTest.java
index 4977c97..3bcc25c 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/desugar/DefaultInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/desugar/DefaultInterfaceMethodTest.java
@@ -67,7 +67,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(LibraryInterface.class, ProgramClass.class)
.addKeepMainRule(ProgramClass.class)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), ProgramClass.class)
.assertSuccessWithOutput(EXPECTED);
}
@@ -79,7 +79,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(LibraryInterface.class)
.addKeepRules(ruleContent)
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.compile();
CodeInspector inspector = libraryResult.inspector();
assertTrue(inspector.clazz(LibraryInterface.class).isPresent());
@@ -99,7 +99,7 @@
.addProgramClasses(ProgramClass.class)
.addClasspathClasses(LibraryInterface.class)
.addApplyMapping(libraryResult.getProguardMap())
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.compile()
.addRunClasspathFiles(libraryResult.writeToZip())
.run(parameters.getRuntime(), ProgramClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptViaClassInitializerTestRunner.java b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptViaClassInitializerTestRunner.java
index 0e61231..d211971 100644
--- a/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptViaClassInitializerTestRunner.java
+++ b/src/test/java/com/android/tools/r8/shaking/keptgraph/KeptViaClassInitializerTestRunner.java
@@ -94,10 +94,10 @@
.enableInliningAnnotations()
.addProgramClassesAndInnerClasses(Main.class, A.class, T.class)
.addKeepMethodRules(mainMethod)
+ .setMinApi(AndroidApiLevel.N)
.apply(
b -> {
if (backend == Backend.DEX) {
- b.setMinApi(AndroidApiLevel.N);
b.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.N));
}
})
diff --git a/src/test/java/com/android/tools/r8/shaking/reflection/ReflectiveNewInstanceTest.java b/src/test/java/com/android/tools/r8/shaking/reflection/ReflectiveNewInstanceTest.java
index 8416d01..c9efc35 100644
--- a/src/test/java/com/android/tools/r8/shaking/reflection/ReflectiveNewInstanceTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/reflection/ReflectiveNewInstanceTest.java
@@ -54,7 +54,7 @@
.addKeepMainRule(TestClass.class)
.enableGraphInspector()
.enableUnusedArgumentAnnotations()
- .apply(parameters::setMinApiForRuntime)
+ .setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutputAfterR8)
.graphInspector();
