Change calls to noMinification in tests to addDontObfuscate
noMinification disable minification through the builder where addDontObfuscate disable it by mapping rules. -dontobfuscate is used by most so this CL changes noMinification in our tests to use addDontObfuscate.
IntelliJ refactoring changing call sits of noMinification to
addDontObfuscate.
Change-Id: Iefc3018e44a6cf54cace0a14d1dd96dad0c036ee
diff --git a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
index e1de2d3..d28d969 100644
--- a/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestShrinkerBuilder.java
@@ -81,6 +81,7 @@
return self();
}
+ @Deprecated
public T noMinification() {
return minification(false);
}
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/ConstructorRelaxationTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/ConstructorRelaxationTest.java
index 4f91077..f7afbc4 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/ConstructorRelaxationTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/ConstructorRelaxationTest.java
@@ -189,7 +189,7 @@
o.inlinerOptions().enableInlining = false;
o.enableVerticalClassMerging = false;
})
- .noMinification()
+ .addDontObfuscate()
.addKeepMainRule(mainClass)
.allowAccessModification()
.setMinApi(parameters.getRuntime())
diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java
index 29e44c0..aff91c6 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/NonConstructorRelaxationTest.java
@@ -86,7 +86,7 @@
.enableMemberValuePropagationAnnotations()
.enableUnusedArgumentAnnotations(!enableUnusedArgumentRemoval)
.addKeepMainRule(mainClass)
- .noMinification()
+ .addDontObfuscate()
.addKeepRules(
// Note: we use '-checkdiscard' to indirectly check that the access relaxation is
// done which leads to inlining of all pB*** methods so they are removed. Without
@@ -172,7 +172,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .noMinification()
+ .addDontObfuscate()
.addKeepRules(
"-checkdiscard class " + Base.class.getCanonicalName() + "{",
" *** p*();",
diff --git a/src/test/java/com/android/tools/r8/annotations/AnnotationWithInjectedMethodsTest.java b/src/test/java/com/android/tools/r8/annotations/AnnotationWithInjectedMethodsTest.java
index be3ee34..da34ea7 100644
--- a/src/test/java/com/android/tools/r8/annotations/AnnotationWithInjectedMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/annotations/AnnotationWithInjectedMethodsTest.java
@@ -54,7 +54,7 @@
.addKeepClassAndMembersRules(AnnotationWithInjectedMethod.class)
.addKeepRuntimeVisibleAnnotations()
.addOptionsModification(options -> options.testing.allowInjectedAnnotationMethods = true)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfDefaultInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfDefaultInterfaceMethodsTest.java
index 420bf8d..9a243d3 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfDefaultInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfDefaultInterfaceMethodsTest.java
@@ -52,7 +52,7 @@
// We are testing that we do not inline/merge higher api-levels
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
.enableNoMethodStaticizingAnnotations()
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfStaticInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfStaticInterfaceMethodsTest.java
index 22714a3..9411c7d 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfStaticInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoInliningOfStaticInterfaceMethodsTest.java
@@ -52,7 +52,7 @@
.apply(ApiModelingTestHelper::enableApiCallerIdentification)
// We are testing that we do not inline/merge higher api-levels
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingSubReferenceApiTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingSubReferenceApiTest.java
index d105c17..f49536b 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingSubReferenceApiTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelNoVerticalMergingSubReferenceApiTest.java
@@ -65,7 +65,7 @@
inspector.assertNoClassesMerged();
}
})
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/B77836766.java b/src/test/java/com/android/tools/r8/bridgeremoval/B77836766.java
index 57c41a8..d08bb2f 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/B77836766.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/B77836766.java
@@ -147,7 +147,7 @@
.addOptionsModification(this::configure)
.enableConstantArgumentAnnotations()
.noHorizontalClassMerging(cls2Class.name)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
@@ -280,7 +280,7 @@
.addOptionsModification(this::configure)
.enableConstantArgumentAnnotations()
.noHorizontalClassMerging(derivedIntegerClass.name)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
@@ -392,7 +392,7 @@
.addKeepMainRule(mainClass.name)
.addOptionsModification(this::configure)
.enableConstantArgumentAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
@@ -481,7 +481,7 @@
.addKeepMainRule(mainClass.name)
.addOptionsModification(this::configure)
.enableConstantArgumentAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeHoistingAccessibilityTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeHoistingAccessibilityTest.java
index 1eb5247..eac0142 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeHoistingAccessibilityTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/BridgeHoistingAccessibilityTest.java
@@ -80,7 +80,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/KeptBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/KeptBridgeHoistingTest.java
index e45bdcc..458a8d2 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/KeptBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/KeptBridgeHoistingTest.java
@@ -46,7 +46,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with signature changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonSuperclassBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonSuperclassBridgeHoistingTest.java
index 2819311..ff05bfd 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonSuperclassBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/NonSuperclassBridgeHoistingTest.java
@@ -48,7 +48,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with signature changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/PositiveBridgeHoistingTest.java b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/PositiveBridgeHoistingTest.java
index 120d7b4..2ac940a 100644
--- a/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/PositiveBridgeHoistingTest.java
+++ b/src/test/java/com/android/tools/r8/bridgeremoval/hoisting/PositiveBridgeHoistingTest.java
@@ -59,7 +59,7 @@
.enableNoMethodStaticizingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/cf/AlwaysNullGetItemTestRunner.java b/src/test/java/com/android/tools/r8/cf/AlwaysNullGetItemTestRunner.java
index f99896f..a459923 100644
--- a/src/test/java/com/android/tools/r8/cf/AlwaysNullGetItemTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/AlwaysNullGetItemTestRunner.java
@@ -39,7 +39,7 @@
testForR8(parameters.getBackend())
.addProgramClassesAndInnerClasses(CLASS)
.debug()
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.setMinApi(parameters.getApiLevel())
.compile()
diff --git a/src/test/java/com/android/tools/r8/cf/BasicBlockMuncherQuadraticTest.java b/src/test/java/com/android/tools/r8/cf/BasicBlockMuncherQuadraticTest.java
index 7ab71ea..6cb424f 100644
--- a/src/test/java/com/android/tools/r8/cf/BasicBlockMuncherQuadraticTest.java
+++ b/src/test/java/com/android/tools/r8/cf/BasicBlockMuncherQuadraticTest.java
@@ -16,7 +16,7 @@
testForR8(Backend.CF)
.addKeepMainRule(MethodHolder.class)
.addInnerClasses(BasicBlockMuncherQuadraticTest.class)
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(options -> options.testing.basicBlockMuncherIterationLimit = 50000)
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/cf/CloserTestRunner.java b/src/test/java/com/android/tools/r8/cf/CloserTestRunner.java
index bce6ae0..dea6642 100644
--- a/src/test/java/com/android/tools/r8/cf/CloserTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/CloserTestRunner.java
@@ -44,7 +44,7 @@
.addProgramClasses(CloserTest.class)
.addKeepMainRule(CloserTest.class)
.setMode(CompilationMode.RELEASE)
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.enableInliningAnnotations()
.compile()
diff --git a/src/test/java/com/android/tools/r8/cf/DebugInfoTestRunner.java b/src/test/java/com/android/tools/r8/cf/DebugInfoTestRunner.java
index 75a8b55..0d62e66 100644
--- a/src/test/java/com/android/tools/r8/cf/DebugInfoTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/DebugInfoTestRunner.java
@@ -53,7 +53,7 @@
return testForR8(backend)
.debug()
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(o -> o.invalidDebugInfoFatal = true);
}
}
diff --git a/src/test/java/com/android/tools/r8/cf/GetClassLdcClassTest.java b/src/test/java/com/android/tools/r8/cf/GetClassLdcClassTest.java
index c5284c0..07d16af 100644
--- a/src/test/java/com/android/tools/r8/cf/GetClassLdcClassTest.java
+++ b/src/test/java/com/android/tools/r8/cf/GetClassLdcClassTest.java
@@ -65,7 +65,7 @@
.addKeepMainRule(TestClass.class)
// We cannot keep class Runner, as that prohibits getClass optimization.
// Instead disable minification and inlining of the Runner class and method.
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.run(parameters.getRuntime(), TestClass.class)
@@ -90,7 +90,7 @@
.addKeepMainRule(TestClass.class)
// We cannot keep class Runner, as that prohibits getClass optimization.
// Instead disable minification and inlining of the Runner class and method.
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.run(parameters.getRuntime(), TestClass.class);
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 7b52abd..0bdb4f8 100644
--- a/src/test/java/com/android/tools/r8/cf/KeepDeserializeLambdaMethodTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/KeepDeserializeLambdaMethodTestRunner.java
@@ -91,9 +91,7 @@
// TODO(b/148836254): Support deserialized lambdas without the need of additional rules.
"-keep class * { private static synthetic void lambda$*(); }");
} else {
- builder
- .noMinification()
- .noTreeShaking();
+ builder.addDontObfuscate().noTreeShaking();
}
builder
.run(parameters.getRuntime(), getMainClass())
diff --git a/src/test/java/com/android/tools/r8/cf/PrintSeedsWithDeserializeLambdaMethodTest.java b/src/test/java/com/android/tools/r8/cf/PrintSeedsWithDeserializeLambdaMethodTest.java
index 33b13a9..255e2be 100644
--- a/src/test/java/com/android/tools/r8/cf/PrintSeedsWithDeserializeLambdaMethodTest.java
+++ b/src/test/java/com/android/tools/r8/cf/PrintSeedsWithDeserializeLambdaMethodTest.java
@@ -58,7 +58,7 @@
options -> options.getOpenClosedInterfacesOptions().suppressAllOpenInterfaces())
.addPrintSeeds()
.allowStdoutMessages()
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.run(parameters.getRuntime(), getMainClass())
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/cf/TryRangeTestRunner.java b/src/test/java/com/android/tools/r8/cf/TryRangeTestRunner.java
index 8f5dc82..7c9d4ac 100644
--- a/src/test/java/com/android/tools/r8/cf/TryRangeTestRunner.java
+++ b/src/test/java/com/android/tools/r8/cf/TryRangeTestRunner.java
@@ -39,7 +39,7 @@
.addProgramClasses(TryRangeTest.class)
.addKeepMainRule(TryRangeTest.class)
.setMode(CompilationMode.RELEASE)
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.enableInliningAnnotations()
.addOptionsModification(o -> o.enableLoadStoreOptimization = false)
@@ -54,7 +54,7 @@
.addProgramClasses(TryRangeTestLimitRange.class)
.addKeepMainRule(TryRangeTestLimitRange.class)
.setMode(CompilationMode.RELEASE)
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.enableInliningAnnotations()
.addOptionsModification(
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java
index 41694f6..db6cc21 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/PinnedClassMemberReferenceTest.java
@@ -26,7 +26,7 @@
return testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.setMinApi(parameters.getApiLevel());
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java
index fb7e05e..07f3fce 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceCollisionTest.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java
index 4dfb6df..43bbf33 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceFixedCollisionTest.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java
index 65b57aa..5904824 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerInterfaceImplementedByParentTest.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java
index 5e8b88d..b00bc63 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/TreeFixerSubClassCollisionTest.java
@@ -26,7 +26,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java
index 75e26f1..18017a1 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/InliningAfterStaticClassMergerTest.java
@@ -86,7 +86,7 @@
.addOptionsModification(
options -> options.libraryInterfacesMayHaveStaticInitialization = true)
.enableMemberValuePropagationAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java
index 189ac21..7555576 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontalstatic/StaticClassMergerVisibilityTest.java
@@ -46,7 +46,7 @@
.assertMergedInto(C.class, D.class))
.enableInliningAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("A.print()", "B.print()", "C.print()", "D.print()")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/B141942381.java b/src/test/java/com/android/tools/r8/classmerging/vertical/B141942381.java
index d840b52..5ab767d 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/B141942381.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/B141942381.java
@@ -52,7 +52,7 @@
.setMinApi(parameters.getApiLevel())
.addKeepAttributes("Signatures")
.enableNeverClassInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/IncorrectRewritingOfInvokeSuperTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/IncorrectRewritingOfInvokeSuperTest.java
index 505aa07..2ecdb10 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/IncorrectRewritingOfInvokeSuperTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/IncorrectRewritingOfInvokeSuperTest.java
@@ -35,7 +35,7 @@
.addKeepMainRule(TestClass.class)
.addOptionsModification(options -> options.enableUnusedInterfaceRemoval = false)
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), TestClass.class)
.assertSuccess();
diff --git a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
index cbbb43e..ae53238 100644
--- a/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/vertical/VerticalClassMergerTest.java
@@ -101,7 +101,7 @@
.addProgramFiles(EXAMPLE_JAR)
.addKeepRuleFiles(proguardConfig)
.enableProguardTestOptions()
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(optionsConsumer)
.setMinApi(parameters.getApiLevel())
.compile()
@@ -1183,7 +1183,7 @@
appBuilder.addProgramResourceProvider(provider);
}
})
- .noMinification()
+ .addDontObfuscate()
.enableProguardTestOptions()
.setMinApi(parameters.getApiLevel())
.compile();
diff --git a/src/test/java/com/android/tools/r8/compatproguard/CompatKeepClassMemberNamesTestRunner.java b/src/test/java/com/android/tools/r8/compatproguard/CompatKeepClassMemberNamesTestRunner.java
index 68e882e..dba64d3 100644
--- a/src/test/java/com/android/tools/r8/compatproguard/CompatKeepClassMemberNamesTestRunner.java
+++ b/src/test/java/com/android/tools/r8/compatproguard/CompatKeepClassMemberNamesTestRunner.java
@@ -114,7 +114,7 @@
.addProgramClasses(CLASSES)
.addKeepMainRule(MAIN_CLASS)
.addInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.compile());
}
@@ -143,7 +143,7 @@
RR extends TestRunResult<RR>,
T extends TestShrinkerBuilder<C, B, CR, RR, T>>
T buildWithMembersRule(TestShrinkerBuilder<C, B, CR, RR, T> builder) {
- return buildWithMembersRuleEnableMinification(builder).noMinification();
+ return buildWithMembersRuleEnableMinification(builder).addDontObfuscate();
}
private <CR extends TestCompileResult<CR, RR>, RR extends TestRunResult<RR>>
@@ -211,7 +211,7 @@
.addKeepMainRule(MAIN_CLASS)
.addKeepRules("-keepclassmembers " + KEEP_RULE_NON_STATIC)
.addInliningAnnotations()
- .noMinification();
+ .addDontObfuscate();
}
@Test
@@ -315,7 +315,7 @@
.addProgramClasses(CLASSES)
.addKeepMainRule(MAIN_CLASS)
.addInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.addKeepRules("-keepclassmembers class " + Bar.class.getTypeName())
.compile());
}
@@ -344,7 +344,7 @@
RR extends TestRunResult<RR>,
T extends TestShrinkerBuilder<C, B, CR, RR, T>>
T buildWithMemberNamesRule(TestShrinkerBuilder<C, B, CR, RR, T> builder) {
- return buildWithMemberNamesRuleEnableMinification(builder).noMinification();
+ return buildWithMemberNamesRuleEnableMinification(builder).addDontObfuscate();
}
private <CR extends TestCompileResult<CR, RR>, RR extends TestRunResult<RR>>
diff --git a/src/test/java/com/android/tools/r8/compatproguard/ForNameTest.java b/src/test/java/com/android/tools/r8/compatproguard/ForNameTest.java
index a5a9f0a1..97cb7c9 100644
--- a/src/test/java/com/android/tools/r8/compatproguard/ForNameTest.java
+++ b/src/test/java/com/android/tools/r8/compatproguard/ForNameTest.java
@@ -78,7 +78,7 @@
// Add main dex rule to disable Class.forName() optimization.
.addMainDexRules("-keep class " + CLASS_NAME)
.addDontOptimize()
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.setMinApi(AndroidApiLevel.B));
diff --git a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
index 2c3a478..0f0a782 100644
--- a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
@@ -57,7 +57,7 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST))
.addKeepAllAttributes()
.allowDiagnosticWarningMessages()
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.setMode(CompilationMode.DEBUG)
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/debug/LambdaOuterContextTestRunner.java b/src/test/java/com/android/tools/r8/debug/LambdaOuterContextTestRunner.java
index 99a19f5..0e77b85 100644
--- a/src/test/java/com/android/tools/r8/debug/LambdaOuterContextTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/LambdaOuterContextTestRunner.java
@@ -11,7 +11,6 @@
import com.android.tools.r8.debug.LambdaOuterContextTest.Converter;
import com.android.tools.r8.utils.StringUtils;
import org.apache.harmony.jpda.tests.framework.jdwp.Value;
-import org.junit.Ignore;
import org.junit.Test;
public class LambdaOuterContextTestRunner extends DebugTestBase {
@@ -40,7 +39,7 @@
testForR8(Backend.CF)
.addProgramClassesAndInnerClasses(CLASS)
.debug()
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.compile();
compileResult.run(CLASS).assertSuccessWithOutput(EXPECTED);
diff --git a/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java b/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
index af193de..c161a96 100644
--- a/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/debug/LineNumberOptimizationTest.java
@@ -52,7 +52,7 @@
.setMinApi(parameters.getApiLevel())
.setMode(dontOptimizeByEnablingDebug ? CompilationMode.DEBUG : CompilationMode.RELEASE)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addKeepAttributeSourceFile()
.addKeepAttributeLineNumberTable()
.addOptionsModification(
diff --git a/src/test/java/com/android/tools/r8/debug/LoadInvokeLoadOptimizationTestRunner.java b/src/test/java/com/android/tools/r8/debug/LoadInvokeLoadOptimizationTestRunner.java
index 9242d61..e382d39 100644
--- a/src/test/java/com/android/tools/r8/debug/LoadInvokeLoadOptimizationTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debug/LoadInvokeLoadOptimizationTestRunner.java
@@ -40,7 +40,7 @@
temp ->
testForR8(temp, backend)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addKeepRules("-keepattributes SourceFile,LineNumberTable")
.addProgramClasses(CLASS)
.setMinApi(minApi)
diff --git a/src/test/java/com/android/tools/r8/debuginfo/KotlinDebugInfoTestRunner.java b/src/test/java/com/android/tools/r8/debuginfo/KotlinDebugInfoTestRunner.java
index 80a51c8..cb0ee5c 100644
--- a/src/test/java/com/android/tools/r8/debuginfo/KotlinDebugInfoTestRunner.java
+++ b/src/test/java/com/android/tools/r8/debuginfo/KotlinDebugInfoTestRunner.java
@@ -85,7 +85,7 @@
.addOptionsModification(options -> options.invalidDebugInfoFatal = true)
.apply(configuration)
.debug()
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.compile()
.run(parameters.getRuntime(), className)
diff --git a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithInvokeInterfaceTestRunner.java b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithInvokeInterfaceTestRunner.java
index c04e3eb..0136d59 100644
--- a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithInvokeInterfaceTestRunner.java
+++ b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithInvokeInterfaceTestRunner.java
@@ -57,12 +57,13 @@
@Test
public void testR8Cf() throws Throwable {
- R8TestCompileResult compileResult = testForR8(Backend.CF)
- .addProgramClassesAndInnerClasses(CLASS)
- .noMinification()
- .noTreeShaking()
- .debug()
- .compile();
+ R8TestCompileResult compileResult =
+ testForR8(Backend.CF)
+ .addProgramClassesAndInnerClasses(CLASS)
+ .addDontObfuscate()
+ .noTreeShaking()
+ .debug()
+ .compile();
compileResult
// TODO(b/123506120): Add .assertNoMessages()
.run(CLASS)
diff --git a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java
index 409d776..499527f 100644
--- a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java
+++ b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithSelfReferenceTestRunner.java
@@ -103,7 +103,7 @@
testForR8(parameters.getBackend())
.addProgramClassesAndInnerClasses(CLASS)
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.addKeepAllAttributes()
.debug()
diff --git a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithUnderscoreThisTestRunner.java b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithUnderscoreThisTestRunner.java
index 9860a15..263a87e 100644
--- a/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithUnderscoreThisTestRunner.java
+++ b/src/test/java/com/android/tools/r8/desugar/DefaultLambdaWithUnderscoreThisTestRunner.java
@@ -114,7 +114,7 @@
testForR8(parameters.getBackend())
.addProgramClassesAndInnerClasses(CLASS)
.addKeepAllClassesRule()
- .noMinification()
+ .addDontObfuscate()
.setMode(CompilationMode.DEBUG)
.addOptionsModification(
internalOptions -> {
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarLambdaContextDuplicateInLibraryTest.java b/src/test/java/com/android/tools/r8/desugar/DesugarLambdaContextDuplicateInLibraryTest.java
index 98839fa..c712d37 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarLambdaContextDuplicateInLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarLambdaContextDuplicateInLibraryTest.java
@@ -48,7 +48,7 @@
@Test
public void testOnlyProgram() throws Exception {
testForR8(parameters.getBackend())
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(PROGRAM)
.addProgramClasses(LIBRARY)
.addKeepMainRule(MAIN)
@@ -73,7 +73,7 @@
@Test
public void testDuplicate() throws Exception {
testForR8(parameters.getBackend())
- .noMinification() // Don't minify so the name collision will happen.
+ .addDontObfuscate() // Don't minify so the name collision will happen.
.addProgramClasses(PROGRAM)
.addProgramClasses(LIBRARY)
.addLibraryClasses(LIBRARY)
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugaredLambdaImplementationInliningTest.java b/src/test/java/com/android/tools/r8/desugar/DesugaredLambdaImplementationInliningTest.java
index cb1b96e..6a0f410 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugaredLambdaImplementationInliningTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugaredLambdaImplementationInliningTest.java
@@ -45,7 +45,7 @@
testForR8Compat(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/BackportMainDexTest.java b/src/test/java/com/android/tools/r8/desugar/backports/BackportMainDexTest.java
index 81f0674..a3bec4a 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/BackportMainDexTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/BackportMainDexTest.java
@@ -238,7 +238,7 @@
MainDexConsumer mainDexConsumer = parameters.isDexRuntime() ? new MainDexConsumer() : null;
testForR8(parameters.getBackend())
.debug() // Use debug mode to force a minimal main dex.
- .noMinification() // Disable minification so we can inspect the synthetic names.
+ .addDontObfuscate() // Disable minification so we can inspect the synthetic names.
.applyIf(mainDexConsumer != null, b -> b.setProgramConsumer(mainDexConsumer))
.addProgramClasses(CLASSES)
.addKeepMainRule(TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestBuilder.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestBuilder.java
index 28d4db2..46d0b73 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestBuilder.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/test/DesugaredLibraryTestBuilder.java
@@ -282,7 +282,7 @@
}
public DesugaredLibraryTestBuilder<T> noMinification() {
- withR8TestBuilder(R8TestBuilder::noMinification);
+ withR8TestBuilder(R8TestBuilder::addDontObfuscate);
return this;
}
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java
index 832e72d..6fb309f 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/FullNestOnProgramPathTest.java
@@ -106,7 +106,7 @@
for (String nestID : NEST_IDS) {
testForR8(parameters.getBackend())
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addKeepAllAttributes()
.setMinApi(parameters.getApiLevel())
.addProgramFiles(classesOfNest(nestID))
@@ -149,7 +149,7 @@
return testForR8(getStaticTemp(), backend)
.apply(configuration)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addKeepAllAttributes()
.addOptionsModification(options -> options.enableNestReduction = false)
.addProgramFiles(JAR)
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestCompilationExceptionTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestCompilationExceptionTest.java
index 2533da9..c7c4b21 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestCompilationExceptionTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestCompilationExceptionTest.java
@@ -92,7 +92,7 @@
} else {
return testForR8(parameters.getBackend())
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addKeepAllAttributes()
.setMinApi(parameters.getApiLevel())
.addProgramFiles(matchingClasses)
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestConstructorRemovedArgTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestConstructorRemovedArgTest.java
index 04eac5e..adfc202 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestConstructorRemovedArgTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestConstructorRemovedArgTest.java
@@ -44,7 +44,7 @@
String nestID = "constructors";
testForR8(parameters.getBackend())
.addKeepMainRule(getMainClass(nestID))
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.addOptionsModification(options -> options.enableClassInlining = false)
.addProgramFiles(classesOfNest(nestID))
@@ -60,7 +60,7 @@
testForR8(parameters.getBackend())
.noTreeShaking()
.addKeepMainRule(getMainClass(nestID))
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.addOptionsModification(options -> options.enableClassInlining = false)
.addProgramFiles(classesOfNest(nestID))
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestMemberPropagatedTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestMemberPropagatedTest.java
index 8107d71..3e86e4f 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestMemberPropagatedTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestMemberPropagatedTest.java
@@ -41,7 +41,7 @@
List<Path> toCompile = classesMatching("NestPvtFieldPropagated");
testForR8(parameters.getBackend())
.addKeepMainRule(getMainClass("memberPropagated"))
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
options -> {
options.enableClassInlining = false;
diff --git a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestMethodInlinedTest.java b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestMethodInlinedTest.java
index 8eb08f4..a235beb 100644
--- a/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestMethodInlinedTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/nestaccesscontrol/NestMethodInlinedTest.java
@@ -55,7 +55,7 @@
List<Path> toCompile = classesMatching("NestPvtMethodCallInlined");
testForR8(parameters.getBackend())
.addKeepMainRule(getMainClass("pvtCallInlined"))
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
options -> {
options.enableClassInlining = false;
diff --git a/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java b/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java
index 9a74bb5..96af73c 100644
--- a/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java
@@ -152,7 +152,7 @@
R8FullTestBuilder builder =
testForR8(parameters.getBackend())
.addProgramClassFileData(PROGRAM_DATA)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.addKeepMainRule(MAIN_TYPE);
if (parameters.isCfRuntime()) {
diff --git a/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java b/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java
index dd43eb9..f774b57 100644
--- a/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/twr/TwrCloseResourceDuplicationTest.java
@@ -124,7 +124,7 @@
parameters.getApiLevel().isLessThan(apiLevelWithTwrCloseResourceSupport()),
builder -> builder.addDontWarn("java.lang.AutoCloseable"))
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.run(parameters.getRuntime(), MAIN.typeName(), getZipFile())
.assertSuccessWithOutput(EXPECTED)
.inspect(
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterInlineRegression.java b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterInlineRegression.java
index dfc4327..186346f 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterInlineRegression.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterInlineRegression.java
@@ -48,7 +48,7 @@
// Link against android.jar that contains ReflectiveOperationException.
.addLibraryFiles(parameters.getDefaultAndroidJarAbove(AndroidApiLevel.K))
.enableNoVerticalClassMergingAnnotations()
- .noMinification();
+ .addDontObfuscate();
ProcessResult processResult =
testR8Splitter(
parameters,
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMergeRegression.java b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMergeRegression.java
index c83e290..efd1f73 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMergeRegression.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/DexSplitterMergeRegression.java
@@ -50,7 +50,7 @@
// Link against android.jar that contains ReflectiveOperationException.
.addLibraryFiles(parameters.getDefaultAndroidJarAbove(AndroidApiLevel.K))
.enableNoVerticalClassMergingAnnotations()
- .noMinification();
+ .addDontObfuscate();
ProcessResult processResult =
testR8Splitter(
parameters,
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/R8SplitterInlineToFeature.java b/src/test/java/com/android/tools/r8/dexsplitter/R8SplitterInlineToFeature.java
index 6576720..a7fef57 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/R8SplitterInlineToFeature.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/R8SplitterInlineToFeature.java
@@ -55,7 +55,7 @@
// Link against android.jar that contains ReflectiveOperationException.
.addLibraryFiles(parameters.getDefaultAndroidJarAbove(AndroidApiLevel.K))
.enableNoVerticalClassMergingAnnotations()
- .noMinification();
+ .addDontObfuscate();
ThrowableConsumer<R8TestCompileResult> ensureInlined =
r8TestCompileResult -> {
// Ensure that isEarly from BaseUtilClass is inlined into the feature
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java b/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java
index 3dd0858..d0ea744 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/SyntheticDistributionTest.java
@@ -101,7 +101,7 @@
BaseSuperClass.class.getDeclaredMethod(
"keptApplyLambda", MyFunction.class, String.class)))
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
// BaseDexClassLoader was introduced at api level 14.
.apply(ApiModelingTestHelper::disableOutliningAndStubbing)
.setMinApi(parameters.getApiLevel());
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
index d510c33..12dfd1f 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
@@ -51,7 +51,7 @@
.assertNoOtherClassesMerged())
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .noMinification() // For assertions.
+ .addDontObfuscate() // For assertions.
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.setMinApi(parameters.getApiLevel())
.compile()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingVerticalClassMergeTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingVerticalClassMergeTest.java
index f240835..6f53904 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingVerticalClassMergeTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingVerticalClassMergeTest.java
@@ -43,7 +43,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(UnboxableEnum.class))
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
- .noMinification() // For assertions.
+ .addDontObfuscate() // For assertions.
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.setMinApi(parameters.getApiLevel())
.compile()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java
index 0a00994..19aa6fe 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/FailingMethodEnumUnboxingTest.java
@@ -65,7 +65,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with signature changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::assertEnumsAsExpected);
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java
index d7627a6..fce366e 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/FieldPutEnumUnboxingTest.java
@@ -53,7 +53,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(
i -> {
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/InstanceFieldsEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/InstanceFieldsEnumUnboxingTest.java
index e359c36..a493981 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/InstanceFieldsEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/InstanceFieldsEnumUnboxingTest.java
@@ -71,7 +71,7 @@
FailureBoxedInnerEnumField.EnumField.class,
FailureUnboxedEnumField.EnumField.class,
FailureTooManyUsedFields.EnumField.class))
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.addKeepRules(enumKeepRules.getKeepRules())
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java
index 3bc5c02..bcf2ec5 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/InterfaceEnumUnboxingTest.java
@@ -65,7 +65,7 @@
.assertUnboxedIf(
!parameters.canUseDefaultAndStaticInterfaceMethods(),
FailureDefaultMethodUsed.EnumInterface.class))
- .noMinification()
+ .addDontObfuscate()
.enableNoVerticalClassMergingAnnotations()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumObjectTest.java b/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumObjectTest.java
index 284f8ac..5f24fbe 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumObjectTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumObjectTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(Main.class)
.addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.enableNoVerticalClassMergingAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumTest.java b/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumTest.java
index 288ace4..14eba8a 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/LambdaEnumUnboxingEmptyEnumTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(Main.class)
.addKeepRules(enumKeepRules.getKeepRules())
.enableNeverClassInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.enableNoVerticalClassMergingAnnotations()
.enableInliningAnnotations()
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java
index 43dec5d..670e3b3 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/SwitchEnumUnboxingTest.java
@@ -49,7 +49,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(ENUM_CLASS))
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .noMinification() // For assertions.
+ .addDontObfuscate() // For assertions.
.addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
.setMinApi(parameters.getApiLevel())
.compile()
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsAccessibilityErrorEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsAccessibilityErrorEnumUnboxingTest.java
index 03e6de9..8cb9018 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsAccessibilityErrorEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/VirtualMethodsAccessibilityErrorEnumUnboxingTest.java
@@ -59,7 +59,7 @@
})
.transform();
testForR8(parameters.getBackend())
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(MyEnum.class)
.addProgramClassFileData(testClassData)
.addKeepMainRule(TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/graph/MissingClassThrowingTest.java b/src/test/java/com/android/tools/r8/graph/MissingClassThrowingTest.java
index 14cf693..333ab92 100644
--- a/src/test/java/com/android/tools/r8/graph/MissingClassThrowingTest.java
+++ b/src/test/java/com/android/tools/r8/graph/MissingClassThrowingTest.java
@@ -68,7 +68,7 @@
.addProgramClasses(Program.class)
.addKeepAllClassesRule()
.addKeepAllAttributes()
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
diff --git a/src/test/java/com/android/tools/r8/graph/invokestatic/InvokeStaticOnInterfaceTest.java b/src/test/java/com/android/tools/r8/graph/invokestatic/InvokeStaticOnInterfaceTest.java
index 61d3d32..aaadb51 100644
--- a/src/test/java/com/android/tools/r8/graph/invokestatic/InvokeStaticOnInterfaceTest.java
+++ b/src/test/java/com/android/tools/r8/graph/invokestatic/InvokeStaticOnInterfaceTest.java
@@ -81,7 +81,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.addOptionsModification(o -> o.testing.allowInvokeErrors = true)
- .noMinification()
+ .addDontObfuscate()
.addKeepMainRule(Main.class)
.run(parameters.getRuntime(), Main.class);
if (parameters.getRuntime().asCf().isNewerThan(CfVm.JDK8)) {
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 009c587..9b88d56 100644
--- a/src/test/java/com/android/tools/r8/internal/Regression127524985.java
+++ b/src/test/java/com/android/tools/r8/internal/Regression127524985.java
@@ -68,7 +68,7 @@
testForR8(parameters.getBackend())
.debug()
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addKeepAllAttributes()
.addKeepRules("-dontwarn")
.allowDiagnosticWarningMessages()
diff --git a/src/test/java/com/android/tools/r8/ir/conversion/StringSwitchConversionFromIfTest.java b/src/test/java/com/android/tools/r8/ir/conversion/StringSwitchConversionFromIfTest.java
index bcdd93f..6573810 100644
--- a/src/test/java/com/android/tools/r8/ir/conversion/StringSwitchConversionFromIfTest.java
+++ b/src/test/java/com/android/tools/r8/ir/conversion/StringSwitchConversionFromIfTest.java
@@ -55,7 +55,7 @@
.enableInliningAnnotations()
// TODO(b/135560746): Add support for treating the keys of a string-switch instruction as an
// identifier name string.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/AlwaysThrowNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/AlwaysThrowNullTest.java
index 684b669..9dcfa24 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/AlwaysThrowNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/AlwaysThrowNullTest.java
@@ -243,7 +243,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.addKeepMainRule(MAIN)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/MemberValuePropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/MemberValuePropagationTest.java
index 1433f2e..7d1141c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/MemberValuePropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/MemberValuePropagationTest.java
@@ -75,7 +75,7 @@
return testForR8(backend)
.addProgramFiles(EXAMPLE_JAR)
.addKeepRuleFiles(proguardConfig)
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(o -> o.enableClassInlining = false)
.compile()
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java b/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java
index 9b0bb90..e582d84 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/NonNullParamTest.java
@@ -66,7 +66,7 @@
.addKeepMainRule(mainClass)
.addKeepRules(ImmutableList.of("-keepattributes InnerClasses,Signature,EnclosingMethod"))
// All tests are checking if invocations to certain null-check utils are gone.
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
options -> {
// Need to increase a little bit to inline System.out.println
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java
index 77da418..f40816f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/ObjectsRequireNonNullTest.java
@@ -136,7 +136,7 @@
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
.addKeepMainRule(MAIN)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
index b7a3474..303bf0c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
@@ -137,7 +137,7 @@
})
.allowAccessModification(allowAccessModification)
.enableProguardTestOptions()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.applyIf(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectPositiveTest.java
index f726e4f..2c79f4c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeDirectPositiveTest.java
@@ -44,7 +44,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("non-null")
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfacePositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfacePositiveTest.java
index 39f33af..d1a160a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfacePositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeInterfacePositiveTest.java
@@ -52,7 +52,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("non-null")
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticPositiveTest.java b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticPositiveTest.java
index 3694dc8..9f01b31 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticPositiveTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/callsites/constants/InvokeStaticPositiveTest.java
@@ -42,7 +42,7 @@
.addKeepMainRule(MAIN)
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutputLines("non-null")
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java
index 380c5be..5d32d7a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/ConstClassCanonicalizationTest.java
@@ -214,7 +214,7 @@
.addProgramClassesAndInnerClasses(MAIN)
.addKeepMainRule(MAIN)
.addKeepAttributeInnerClassesAndEnclosingMethod()
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(InternalOptions::disableNameReflectionOptimization)
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IdempotentFunctionCallCanonicalizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IdempotentFunctionCallCanonicalizationTest.java
index 5c8cfd8..b3e1364 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IdempotentFunctionCallCanonicalizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IdempotentFunctionCallCanonicalizationTest.java
@@ -242,7 +242,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IllegalAccessConstClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IllegalAccessConstClassTest.java
index 7601389..126c1f0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IllegalAccessConstClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/IllegalAccessConstClassTest.java
@@ -86,12 +86,11 @@
@Test
public void testR8() throws Exception {
testForR8(parameters.getBackend())
- .addProgramClassFileData(
- IllegalAccessConstClassTestDump.PackagePrivateClassDump.dump())
+ .addProgramClassFileData(IllegalAccessConstClassTestDump.PackagePrivateClassDump.dump())
.addProgramClassFileData(
IllegalAccessConstClassTestDump.FakePackagePrivateClassConsumerDump.dump())
.addKeepMainRule(MAIN)
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(InternalOptions::disableNameReflectionOptimization)
.setMinApi(parameters.getRuntime())
.compile()
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/UnresolvableLibraryConstClassTest.java b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/UnresolvableLibraryConstClassTest.java
index 2765bb2..cc65eae 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/UnresolvableLibraryConstClassTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/canonicalization/UnresolvableLibraryConstClassTest.java
@@ -112,7 +112,7 @@
.addLibraryFiles(ToolHelper.getDefaultAndroidJar())
.addProgramClasses(ProgramClass1.class, ProgramClass2.class, ProgramSubClass.class, MAIN)
.addKeepMainRule(MAIN)
- .noMinification()
+ .addDontObfuscate()
.enableNoVerticalClassMergingAnnotations()
.addOptionsModification(InternalOptions::disableNameReflectionOptimization)
.setMinApi(parameters.getRuntime())
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastDebugTestRunner.java b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastDebugTestRunner.java
index dc86e78..e398a65 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastDebugTestRunner.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastDebugTestRunner.java
@@ -53,7 +53,7 @@
.addOptionsModification(options -> options.enableVerticalClassMerging = false)
.debug()
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.compile()
.writeToZip(this::setR8Out)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastInterfaceArrayTest.java b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastInterfaceArrayTest.java
index 4431c5a..481bdcd 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastInterfaceArrayTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/CheckCastInterfaceArrayTest.java
@@ -43,7 +43,7 @@
.addInnerClasses(CheckCastInterfaceArrayTest.class)
.addKeepMainRule(TestClass.class)
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.compile()
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/RemoveCheckCastAfterClassInlining.java b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/RemoveCheckCastAfterClassInlining.java
index 53d28eb..1f5c944 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/checkcast/RemoveCheckCastAfterClassInlining.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/checkcast/RemoveCheckCastAfterClassInlining.java
@@ -45,7 +45,7 @@
testForR8(parameters.getBackend())
.addProgramClassesAndInnerClasses(Lambda.class)
.addKeepMainRule(Lambda.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.compile()
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithControlFlowTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithControlFlowTest.java
index 44db913..4adf9ef 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithControlFlowTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithControlFlowTest.java
@@ -47,7 +47,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ClassInlinerBuilderWithControlFlowTest.class)
.addKeepMainRule(TestClass.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithMoreControlFlowTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithMoreControlFlowTest.java
index 3778db4..c0277d7 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithMoreControlFlowTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerBuilderWithMoreControlFlowTest.java
@@ -40,7 +40,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ClassInlinerBuilderWithMoreControlFlowTest.class)
.addKeepMainRule(TestClass.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderTest.java
index d9b5cd1..efdaea1 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderTest.java
@@ -61,7 +61,7 @@
.enableAlwaysInliningAnnotations()
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderWithMultipleBuildsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderWithMultipleBuildsTest.java
index d23951c..35dbdce 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderWithMultipleBuildsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerSimplePairBuilderWithMultipleBuildsTest.java
@@ -50,7 +50,7 @@
.addInnerClasses(ClassInlinerSimplePairBuilderWithMultipleBuildsTest.class)
.addKeepMainRule(TestClass.class)
.enableAlwaysInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetDirectMonitorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetDirectMonitorTest.java
index f6252ea..cd28e2a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetDirectMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetDirectMonitorTest.java
@@ -42,7 +42,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetExtraMethodMonitorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetExtraMethodMonitorTest.java
index 0e0b260..23c364e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetExtraMethodMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetExtraMethodMonitorTest.java
@@ -41,7 +41,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetMonitorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetMonitorTest.java
index 216f34e..f858a0e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerStaticGetMonitorTest.java
@@ -41,7 +41,7 @@
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
index 1884e5e..8e5d660 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTest.java
@@ -99,7 +99,7 @@
.assertMergedInto(CycleReferenceBA.class, Iface1Impl.class)
.assertMergedInto(Iface2Impl.class, Iface1Impl.class))
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), main)
.assertSuccessWithOutput(javaOutput);
@@ -212,7 +212,7 @@
.addKeepMainRule(main)
.addKeepAttributes("LineNumberTable")
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.run(main)
.assertSuccessWithOutput(javaOutput);
@@ -254,7 +254,7 @@
o.classInlinerOptions().classInliningInstructionAllowance = 1000;
})
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.run(main)
.assertSuccessWithOutput(javaOutput);
@@ -306,7 +306,7 @@
.addKeepAttributes("LineNumberTable")
.allowAccessModification()
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), main)
.assertSuccessWithOutput(javaOutput);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTupleBuilderConstructorsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTupleBuilderConstructorsTest.java
index 187c5f3..179c5ba 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTupleBuilderConstructorsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/ClassInlinerTupleBuilderConstructorsTest.java
@@ -46,7 +46,7 @@
.addInnerClasses(ClassInlinerTupleBuilderConstructorsTest.class)
.addKeepMainRule(TestClass.class)
.enableAlwaysClassInlineAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/LibraryOverrideClassInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/LibraryOverrideClassInliningTest.java
index 7b68b6d..463efbb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/classinliner/LibraryOverrideClassInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/classinliner/LibraryOverrideClassInliningTest.java
@@ -89,7 +89,7 @@
CodeInspector inspector =
testForR8(parameters.getBackend())
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(
Main.class, SimpleLibraryOverride.class, NonSimpleLibraryOverride.class)
.addKeepMainRule(Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PrivateOverridePublicizerDevirtualizerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PrivateOverridePublicizerDevirtualizerTest.java
index 86739dc..6570849 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PrivateOverridePublicizerDevirtualizerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/devirtualize/PrivateOverridePublicizerDevirtualizerTest.java
@@ -53,7 +53,7 @@
.enableNeverClassInliningAnnotations()
.addKeepMainRule(Main.class)
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnConstantClassIdAfterBranchPruningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnConstantClassIdAfterBranchPruningTest.java
index f3d6a4d..8c029a5 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnConstantClassIdAfterBranchPruningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnConstantClassIdAfterBranchPruningTest.java
@@ -46,7 +46,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnNonConstantClassIdAfterBranchPruningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnNonConstantClassIdAfterBranchPruningTest.java
index 1c2705e..88efb9c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnNonConstantClassIdAfterBranchPruningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/fields/SwitchOnNonConstantClassIdAfterBranchPruningTest.java
@@ -46,7 +46,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningNullCheckTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningNullCheckTest.java
index 94fba01..bf9b044 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningNullCheckTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningNullCheckTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(DoubleInliningNullCheckTest.class)
.addKeepMainRule(TestClass.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("true")
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 3c76052..634d0a8 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
@@ -46,7 +46,7 @@
.addInnerClasses(InlineLibraryInterfaceMethodTest.class)
.addKeepMainRule(TestClass.class)
.setMinApi(testRuntime)
- .noMinification()
+ .addDontObfuscate()
.run(testRuntime, TestClass.class)
.assertSuccess()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynthesizedLambdaClass.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynthesizedLambdaClass.java
index 1bd8db6..dbc7c5b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynthesizedLambdaClass.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/InlineSynthesizedLambdaClass.java
@@ -41,7 +41,7 @@
.addProgramClassesAndInnerClasses(Lambda.class)
.addKeepMainRule(Lambda.class)
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), Lambda.class)
.assertSuccessWithOutput(javaOutput)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/NopInliningConstraintTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/NopInliningConstraintTest.java
index dcc572b..c55ea29 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/NopInliningConstraintTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/conditionalsimpleinlining/NopInliningConstraintTest.java
@@ -41,7 +41,7 @@
.enableAlwaysInliningAnnotations()
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineDefaultInterfaceMethodTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineDefaultInterfaceMethodTest.java
index 177353f..247781d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineDefaultInterfaceMethodTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/interfacemethods/InlineDefaultInterfaceMethodTest.java
@@ -43,7 +43,7 @@
.setMinApi(parameters.getApiLevel())
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .noMinification()
+ .addDontObfuscate()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expectedOutput)
.inspector();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/lambda/LambdaMethodInliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/lambda/LambdaMethodInliningTest.java
index a63addb..b6ca59d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/lambda/LambdaMethodInliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/lambda/LambdaMethodInliningTest.java
@@ -44,7 +44,7 @@
.enableNoVerticalClassMergingAnnotations()
.addOptionsModification(options -> options.enableClassInlining = false)
// TODO(b/173398086): Horizontal class merging breaks uniqueMethodWithName().
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/logging/CustomLoggingFrameworkRemovalTest.java b/src/test/java/com/android/tools/r8/ir/optimize/logging/CustomLoggingFrameworkRemovalTest.java
index b40d47e..c1957f4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/logging/CustomLoggingFrameworkRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/logging/CustomLoggingFrameworkRemovalTest.java
@@ -55,7 +55,7 @@
.enableAssumeNoSideEffectsAnnotations()
.enableInliningAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java
index dc3ca19..9190a4c 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java
@@ -34,7 +34,7 @@
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(this::assertLoopRemoved)
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java
index 07efa85..f8260c0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java
@@ -33,7 +33,7 @@
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.compile()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("end 0", "iteration", "end 1");
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B138912149.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B138912149.java
index bee06af..16dbf43a 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B138912149.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/B138912149.java
@@ -37,16 +37,18 @@
.addInnerClasses(B138912149.class)
.addKeepMainRule(TestClass.class)
.setMinApi(parameters.getRuntime())
- .noMinification()
+ .addDontObfuscate()
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("The end")
- .inspect(codeInspector -> {
- // All <clinit>s are simplified and shrunk.
- codeInspector.forAllClasses(classSubject -> {
- assertThat(classSubject.clinit(), not(isPresent()));
- });
- });
+ .inspect(
+ codeInspector -> {
+ // All <clinit>s are simplified and shrunk.
+ codeInspector.forAllClasses(
+ classSubject -> {
+ assertThat(classSubject.clinit(), not(isPresent()));
+ });
+ });
}
@Test
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldPropagationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldPropagationTest.java
index bd204c7..9a7d252 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldPropagationTest.java
@@ -31,7 +31,7 @@
.addProgramClasses(TestClass.class, Log.class)
.addKeepMainRule(TestClass.class)
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.run(TestClass.class)
.assertSuccessWithOutput(expectedOutput);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningCollisionTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningCollisionTest.java
index 9e5e433..4a7aae0 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/fields/FieldTypeStrengtheningCollisionTest.java
@@ -12,8 +12,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.ir.optimize.membervaluepropagation.fields.FieldTypeStrengtheningTest.A;
-import com.android.tools.r8.ir.optimize.membervaluepropagation.fields.FieldTypeStrengtheningTest.Main;
import com.android.tools.r8.transformers.ClassFileTransformer.FieldPredicate;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
import com.android.tools.r8.utils.codeinspector.FieldSubject;
@@ -44,7 +42,7 @@
.addKeepRules(
"-keep class " + Main.class.getTypeName() + " { " + A.class.getTypeName() + " f; }")
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlinesWithNonNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlinesWithNonNullTest.java
index c4b84a7..696a413 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlinesWithNonNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/OutlinesWithNonNullTest.java
@@ -51,7 +51,7 @@
.addKeepMainRule(TestClassWithNonNullOnOneSide.class)
.setMinApi(parameters.getApiLevel())
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
options -> {
options.outline.threshold = 2;
@@ -72,7 +72,7 @@
.addKeepMainRule(TestClassWithNonNullOnBothSides.class)
.setMinApi(parameters.getApiLevel())
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
options -> {
options.outline.threshold = 2;
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithClassArrayTypeArguments.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithClassArrayTypeArguments.java
index 8bd05e0..63aed12 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithClassArrayTypeArguments.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithClassArrayTypeArguments.java
@@ -61,7 +61,7 @@
.addInnerClasses(OutlinesWithClassArrayTypeArguments.class)
.addKeepMainRule(TestClass.class)
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
options -> {
options.outline.threshold = 2;
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithInterfaceArrayTypeArguments.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithInterfaceArrayTypeArguments.java
index 5a0b120..4f6a822 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithInterfaceArrayTypeArguments.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithInterfaceArrayTypeArguments.java
@@ -75,7 +75,7 @@
.addKeepClassAndMembersRules(ClassImplementingIface.class)
.addKeepClassAndMembersRules(OtherClassImplementingIface.class)
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
options -> {
options.outline.threshold = 2;
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithPrimitiveArrayTypeArguments.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithPrimitiveArrayTypeArguments.java
index 6334006..2065f83 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithPrimitiveArrayTypeArguments.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/arraytypes/OutlinesWithPrimitiveArrayTypeArguments.java
@@ -60,7 +60,7 @@
.addInnerClasses(OutlinesWithPrimitiveArrayTypeArguments.class)
.addKeepMainRule(TestClass.class)
.setMinApi(parameters.getRuntime())
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
options -> {
options.outline.threshold = 2;
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/b112247415/B112247415.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/b112247415/B112247415.java
index 685d805..9b5e916 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/b112247415/B112247415.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/b112247415/B112247415.java
@@ -82,7 +82,7 @@
CodeInspector inspector =
testForR8(parameters.getBackend())
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.addProgramClassesAndInnerClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/b133215941/B133215941.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/b133215941/B133215941.java
index 9c8eb76..ee81c79 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/b133215941/B133215941.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/b133215941/B133215941.java
@@ -70,7 +70,7 @@
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(ClassWithStaticMethod.class)
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(options -> options.outline.threshold = 2)
.compile()
.inspect(this::validateOutlining)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/classtypes/B134462736.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/classtypes/B134462736.java
index 883c62a..9437d1d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/classtypes/B134462736.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/classtypes/B134462736.java
@@ -69,7 +69,7 @@
.enableConstantArgumentAnnotations()
.enableNoMethodStaticizingAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
options -> {
options.outline.threshold = 2;
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/outliner/primitivetypes/PrimitiveTypesTest.java b/src/test/java/com/android/tools/r8/ir/optimize/outliner/primitivetypes/PrimitiveTypesTest.java
index 0e8b0ad..8385328 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/outliner/primitivetypes/PrimitiveTypesTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/outliner/primitivetypes/PrimitiveTypesTest.java
@@ -78,7 +78,7 @@
.addProgramClasses(MyStringBuilder.class)
.addKeepMainRule(testClass)
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
options -> {
options.outline.threshold = 2;
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameTest.java
index 26b927e..2e36ba3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/ForNameTest.java
@@ -145,7 +145,7 @@
.addKeepMainRule(MAIN)
.addKeepAllClassesRule()
.addKeepAttributes("EnclosingMethod", "InnerClasses")
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN);
test(result, 4, 0);
@@ -157,7 +157,7 @@
.addKeepMainRule(MAIN)
.addKeepAllClassesRule()
.addKeepAttributes("EnclosingMethod", "InnerClasses")
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassBaseAndSubTest.java b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassBaseAndSubTest.java
index b5daa52..8190001 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassBaseAndSubTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/reflection/GetClassBaseAndSubTest.java
@@ -42,7 +42,7 @@
@Test
public void testR8() throws Exception {
testForR8(parameters.getBackend())
- .noMinification()
+ .addDontObfuscate()
.addInnerClasses(GetClassBaseAndSubTest.class)
.addKeepMainRule(TestClass.class)
.setMinApi(parameters.getApiLevel())
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 55867a1..908ce00 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
@@ -14,7 +14,6 @@
import com.android.tools.r8.NeverInline;
import com.android.tools.r8.NoHorizontalClassMerging;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.utils.InternalOptions;
import com.android.tools.r8.utils.ListUtils;
import com.android.tools.r8.utils.StringUtils;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
@@ -215,7 +214,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.addKeepMainRule(MAIN)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java
index 9cd0f5f..f265abe 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/staticizer/ClassStaticizerTest.java
@@ -131,7 +131,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.addKeepMainRule(main)
- .noMinification()
+ .addDontObfuscate()
.addKeepAttributes("InnerClasses", "EnclosingMethod")
.addOptionsModification(this::configure)
.allowAccessModification()
@@ -247,7 +247,7 @@
.enableSideEffectAnnotations()
.addKeepMainRule(main)
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(this::configure)
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), main);
@@ -286,7 +286,7 @@
.enableMemberValuePropagationAnnotations()
.addKeepMainRule(main)
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(this::configure)
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), main)
@@ -411,7 +411,7 @@
.enableInliningAnnotations()
.addKeepMainRule(main)
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(this::configure)
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), main)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/NameThenLengthTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/NameThenLengthTest.java
index b96ee7f..f49ca5e 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/NameThenLengthTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/NameThenLengthTest.java
@@ -168,7 +168,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(this::configure)
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderStoredToDeadFieldTest.java b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderStoredToDeadFieldTest.java
index 7c27841..c840e13 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderStoredToDeadFieldTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/string/StringBuilderStoredToDeadFieldTest.java
@@ -41,7 +41,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(StringBuilderStoredToDeadFieldTest.class)
.addKeepMainRule(MAIN)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccess()
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 617fd63..277e1e3 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
@@ -229,7 +229,7 @@
.addProgramClasses(MAIN)
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
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 a6f314d..b2ecca3 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
@@ -109,7 +109,7 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.setMinApi(parameters.getRuntime())
- .noMinification()
+ .addDontObfuscate()
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(JAVA_OUTPUT);
test(result, 0);
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 3ea38e7..dba68cd 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
@@ -113,7 +113,7 @@
.enableMemberValuePropagationAnnotations()
.addKeepMainRule(MAIN)
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(this::configure)
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithEnumDependencyTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithEnumDependencyTest.java
index 14d5f18..c533bbb 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithEnumDependencyTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithEnumDependencyTest.java
@@ -34,7 +34,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(SwitchMapWithEnumDependencyTest.class)
.addKeepMainRule(TestClass.class)
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.setMinApi(parameters.getApiLevel())
.compile();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithMissingFieldTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithMissingFieldTest.java
index 707eb10..5489745 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithMissingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithMissingFieldTest.java
@@ -48,7 +48,7 @@
.setClassDescriptor(descriptor(IncompleteEnum.class))
.transform())
.addKeepMainRule(TestClass.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithSubtypesTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithSubtypesTest.java
index 7bc82e8..d9180bd 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithSubtypesTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithSubtypesTest.java
@@ -36,7 +36,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(SwitchMapWithSubtypesTest.class)
.addKeepMainRule(TestClass.class)
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.setMinApi(parameters.getApiLevel())
.compile();
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithUnexpectedFieldTest.java b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithUnexpectedFieldTest.java
index 167cd47..ec3c1ed 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithUnexpectedFieldTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/switches/SwitchMapWithUnexpectedFieldTest.java
@@ -54,7 +54,7 @@
.setClassDescriptor(descriptor(CompleteEnum.class))
.transform())
.addKeepMainRule(TestClass.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithReceiverOptimizationTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithReceiverOptimizationTest.java
index eca11f0..55889a3 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithReceiverOptimizationTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/InvokeMethodWithReceiverOptimizationTest.java
@@ -68,7 +68,7 @@
options.callSiteOptimizationOptions().setEnabled(enableArgumentPropagation))
// TODO(b/120764902): The calls to getOriginalName() below does not work in presence of
// argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/ParameterRewritingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/ParameterRewritingTest.java
index ee595ce..17d3ccc 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/ParameterRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/ParameterRewritingTest.java
@@ -56,7 +56,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.addOptionsModification(options -> options.enableClassInlining = false)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/VoidReturnTypeRewritingTest.java b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/VoidReturnTypeRewritingTest.java
index 16c8f61..831330d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/VoidReturnTypeRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/uninstantiatedtypes/VoidReturnTypeRewritingTest.java
@@ -61,7 +61,7 @@
.enableNoVerticalClassMergingAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.addOptionsModification(options -> options.enableClassInlining = false)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(expected)
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/EffectivelyUnusedNullableArgumentTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/EffectivelyUnusedNullableArgumentTest.java
index f01e7b7..0f5b122 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/EffectivelyUnusedNullableArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/EffectivelyUnusedNullableArgumentTest.java
@@ -42,7 +42,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAndUninstantiatedTypesTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAndUninstantiatedTypesTest.java
index 7ca05fb..96577a4 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAndUninstantiatedTypesTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedarguments/UnusedAndUninstantiatedTypesTest.java
@@ -38,7 +38,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(UnusedAndUninstantiatedTypesTest.class)
.addKeepMainRule(Main.class)
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalPackageBoundaryTest.java b/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalPackageBoundaryTest.java
index 9c4046d..2ea0223 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalPackageBoundaryTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/unusedinterfaces/UnusedInterfaceRemovalPackageBoundaryTest.java
@@ -47,7 +47,7 @@
.enableNeverClassInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/kotlin/AbstractR8KotlinTestBase.java b/src/test/java/com/android/tools/r8/kotlin/AbstractR8KotlinTestBase.java
index 5759deb..5cdae5d 100644
--- a/src/test/java/com/android/tools/r8/kotlin/AbstractR8KotlinTestBase.java
+++ b/src/test/java/com/android/tools/r8/kotlin/AbstractR8KotlinTestBase.java
@@ -262,7 +262,7 @@
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
.enableProguardTestOptions()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(testParameters.getApiLevel())
.apply(configuration)
.compile()
diff --git a/src/test/java/com/android/tools/r8/kotlin/KotlinDuplicateAnnotationTest.java b/src/test/java/com/android/tools/r8/kotlin/KotlinDuplicateAnnotationTest.java
index f2792a4..6f65db0 100644
--- a/src/test/java/com/android/tools/r8/kotlin/KotlinDuplicateAnnotationTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/KotlinDuplicateAnnotationTest.java
@@ -80,7 +80,7 @@
.addProgramFiles(compiledJars.getForConfiguration(kotlinc, targetVersion))
.addKeepMainRule(MAIN)
.addKeepRules(KEEP_RULES)
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(optionsModifier)
.compile();
fail("Expect to fail");
@@ -97,7 +97,7 @@
.addProgramFiles(compiledJars.getForConfiguration(kotlinc, targetVersion))
.addKeepMainRule(MAIN)
.addKeepRules(KEEP_RULES)
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(optionsModifier)
.compile()
.assertNoMessages();
diff --git a/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineChainTest.java b/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineChainTest.java
index f9e965c..011cc58 100644
--- a/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineChainTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineChainTest.java
@@ -61,7 +61,7 @@
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
.run(parameters.getRuntime(), MAIN, "foobar")
diff --git a/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineTest.java b/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineTest.java
index 6d64e37..a664d59 100644
--- a/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/KotlinIntrinsicsInlineTest.java
@@ -63,7 +63,7 @@
"-keepclasseswithmembers class " + MAIN + "{", " public static *** *(...);", "}"))
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
@@ -118,7 +118,7 @@
"}"))
.allowAccessModification(allowAccessModification)
.allowDiagnosticWarningMessages()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinReflectionLibTest.java b/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinReflectionLibTest.java
index c53700b..6f48c3d 100644
--- a/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinReflectionLibTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinReflectionLibTest.java
@@ -64,7 +64,7 @@
@Test
public void testAsIs() throws Exception {
- test(builder -> builder.noMinification().addDontOptimize().noTreeShaking());
+ test(builder -> builder.addDontObfuscate().addDontOptimize().noTreeShaking());
}
@Test
@@ -74,7 +74,7 @@
@Test
public void testDontShrinkAndDontObfuscate() throws Exception {
- test(builder -> builder.noMinification().noTreeShaking());
+ test(builder -> builder.addDontObfuscate().noTreeShaking());
}
@Test
@@ -98,7 +98,7 @@
@Test
public void testDontObfuscate() throws Exception {
- test(TestShrinkerBuilder::noMinification);
+ test(TestShrinkerBuilder::addDontObfuscate);
}
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/KStyleKotlinLambdaMergingWithEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/kotlin/lambda/KStyleKotlinLambdaMergingWithEnumUnboxingTest.java
index b4abfb6..a3e5c28 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/KStyleKotlinLambdaMergingWithEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/KStyleKotlinLambdaMergingWithEnumUnboxingTest.java
@@ -51,7 +51,7 @@
.allowDiagnosticWarningMessages()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePrunedObjectsTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePrunedObjectsTest.java
index 8532cf9..26d9934 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePrunedObjectsTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewritePrunedObjectsTest.java
@@ -81,7 +81,7 @@
.addKeepClassAndMembersRules(PKG_LIB + ".SubUser")
.addKeepRuntimeVisibleAnnotations()
.enableProguardTestOptions()
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(this::checkPruned)
.writeToZip();
diff --git a/src/test/java/com/android/tools/r8/kotlin/optimize/switches/KotlinEnumSwitchTest.java b/src/test/java/com/android/tools/r8/kotlin/optimize/switches/KotlinEnumSwitchTest.java
index b14aeb4..0963963 100644
--- a/src/test/java/com/android/tools/r8/kotlin/optimize/switches/KotlinEnumSwitchTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/optimize/switches/KotlinEnumSwitchTest.java
@@ -60,7 +60,7 @@
options.enableEnumSwitchMapRemoval = enableSwitchMapRemoval;
})
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.allowDiagnosticWarningMessages()
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/kotlin/stringplus/StringPlusTest.java b/src/test/java/com/android/tools/r8/kotlin/stringplus/StringPlusTest.java
index d189806..b3ba245 100644
--- a/src/test/java/com/android/tools/r8/kotlin/stringplus/StringPlusTest.java
+++ b/src/test/java/com/android/tools/r8/kotlin/stringplus/StringPlusTest.java
@@ -85,7 +85,7 @@
.allowDiagnosticWarningMessages()
.addKeepMainRule(MAIN)
.addKeepRules("-keep class " + MAIN + "{ void keepFor*(...); }")
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningSpuriousRootTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningSpuriousRootTest.java
index 3290031..47bd62e 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningSpuriousRootTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningSpuriousRootTest.java
@@ -84,7 +84,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diagnostics ->
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningWithTracingTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningWithTracingTest.java
index bb3b81c..50e65c9 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningWithTracingTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListFromGenerateMainDexInliningWithTracingTest.java
@@ -85,7 +85,7 @@
.collectMainDexClasses()
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.allowDiagnosticMessages()
.compileWithExpectedDiagnostics(
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListMergeInRootTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListMergeInRootTest.java
index 9451f9a..45df36d 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListMergeInRootTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListMergeInRootTest.java
@@ -42,7 +42,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.addMainDexRules(
"-keep class " + Main.class.getTypeName() + " { public static void main(***); }")
.addOptionsModification(
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexListOutputTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexListOutputTest.java
index 2dd90c1..5bc57ba 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexListOutputTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexListOutputTest.java
@@ -100,7 +100,7 @@
testForR8(Backend.DEX)
.addProgramClasses(HelloWorldMain.class)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(AndroidApiLevel.K)
.addMainDexRuleFiles(mainDexRules)
.setMainDexListConsumer(new FileConsumer(mainDexListOutput))
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexTracingTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexTracingTest.java
index f375004..8f1833a 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexTracingTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexTracingTest.java
@@ -393,7 +393,7 @@
.apply(configuration)
.assumeAllMethodsMayHaveSideEffects()
.setMinApi(minSdk)
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.addDontOptimize()
.setMainDexListConsumer(ToolHelper.consumeString(r8MainDexListOutput::set))
diff --git a/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java b/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java
index 16dc8db..84d8eca 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/MainDexWithSynthesizedClassesTest.java
@@ -174,7 +174,7 @@
.addOptionsModification(o -> o.minimalMainDex = true)
.addMainDexListClasses(TestClass.class)
.addMainDexListFiles(mainDexFile)
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.allowDiagnosticWarningMessages()
.compileWithExpectedDiagnostics(
diff --git a/src/test/java/com/android/tools/r8/maindexlist/checkdiscard/MainDexListCheckDiscard.java b/src/test/java/com/android/tools/r8/maindexlist/checkdiscard/MainDexListCheckDiscard.java
index 125c364..3f1fb69 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/checkdiscard/MainDexListCheckDiscard.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/checkdiscard/MainDexListCheckDiscard.java
@@ -55,7 +55,7 @@
.addMainDexRules(keepMainProguardConfiguration(HelloWorldMain.class))
.addMainDexRules(checkDiscardRule)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/maindexlist/whyareyoukeeping/MainDexListWhyAreYouKeeping.java b/src/test/java/com/android/tools/r8/maindexlist/whyareyoukeeping/MainDexListWhyAreYouKeeping.java
index c4a616c..0aafb8d 100644
--- a/src/test/java/com/android/tools/r8/maindexlist/whyareyoukeeping/MainDexListWhyAreYouKeeping.java
+++ b/src/test/java/com/android/tools/r8/maindexlist/whyareyoukeeping/MainDexListWhyAreYouKeeping.java
@@ -86,7 +86,7 @@
R8FullTestBuilder builder =
testForR8(Backend.DEX)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(AndroidApiLevel.K)
.addProgramClasses(CLASSES)
.addMainDexRules(keepMainProguardConfiguration(HelloWorldMain.class))
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java
index 25674a2..4551dbe 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/MemberRebindingRemoveInterfaceBridgeWithSubTypeTest.java
@@ -56,7 +56,7 @@
.enableNoVerticalClassMergingAnnotations()
.addHorizontallyMergedClassesInspector(
HorizontallyMergedClassesInspector::assertNoClassesMerged)
- .noMinification()
+ .addDontObfuscate()
.run(parameters.getRuntime(), newMainTypeName)
.assertSuccessWithOutputLines("B::foo")
.inspect(
diff --git a/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java b/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java
index 779eb8a..bd76317 100644
--- a/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java
+++ b/src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java
@@ -74,7 +74,7 @@
.addProgramClasses(Main.class)
.setMinApi(parameters.getApiLevel())
.addKeepMainRule(Main.class)
- .noMinification()
+ .addDontObfuscate()
.addClasspathClasses(A.class, B.class)
.addApplyMapping(libraryCompileResult.getProguardMap())
.compile()
@@ -94,7 +94,7 @@
.addProgramClasses(MainWithReferenceToNotMapped.class)
.setMinApi(parameters.getApiLevel())
.addKeepMainRule(MainWithReferenceToNotMapped.class)
- .noMinification()
+ .addDontObfuscate()
.addClasspathClasses(A.class, B.class)
.addApplyMapping(libraryCompileResult.getProguardMap())
.allowDiagnosticWarningMessages()
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterDevirtualizationTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterDevirtualizationTest.java
index 5b13f6b..efb32a2 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterDevirtualizationTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterDevirtualizationTest.java
@@ -127,7 +127,7 @@
testForR8(parameters.getBackend())
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(PROGRAM_CLASSES)
.addApplyMapping(libraryResult.getProguardMap())
.addClasspathClasses(CLASSPATH_CLASSES)
@@ -160,7 +160,7 @@
testForR8(parameters.getBackend())
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(PROGRAM_CLASSES)
.addApplyMapping(libraryResult.getProguardMap())
.addClasspathClasses(CLASSPATH_CLASSES)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingFieldTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingFieldTest.java
index 98ead74..3311270 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingFieldTest.java
@@ -104,7 +104,7 @@
testForR8(parameters.getBackend())
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(PROGRAM_CLASSES)
.addApplyMapping(libraryResult.getProguardMap())
.addLibraryClasses(LIBRARY_CLASSES)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingMethodTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingMethodTest.java
index e101caa..ac2e989 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingMethodTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterHorizontalMergingMethodTest.java
@@ -110,7 +110,7 @@
testForR8(backend)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(PROGRAM_CLASSES)
.addApplyMapping(libraryResult.getProguardMap())
.addLibraryClasses(LIBRARY_CLASSES)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterVerticalMergingFieldTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterVerticalMergingFieldTest.java
index a7a51fd..0fe35cb 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterVerticalMergingFieldTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterVerticalMergingFieldTest.java
@@ -90,7 +90,7 @@
testForR8(backend)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(PROGRAM_CLASSES)
.addApplyMapping(libraryResult.getProguardMap())
.addLibraryClasses(LIBRARY_CLASSES)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterVerticalMergingMethodTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterVerticalMergingMethodTest.java
index 198fcde..609465f 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterVerticalMergingMethodTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingAfterVerticalMergingMethodTest.java
@@ -135,7 +135,7 @@
throws CompilationFailedException {
return testForR8(staticTemp, backend)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(PROGRAM_CLASSES)
.addApplyMapping(proguardMap)
.addLibraryClasses(LIBRARY_CLASSES)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceInvokeTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceInvokeTest.java
index b4b6807..8c7e804 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceInvokeTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingInterfaceInvokeTest.java
@@ -73,7 +73,7 @@
testForR8(parameters.getBackend())
.addClasspathClasses(classPathClasses)
.addProgramClasses(TestApp.class)
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.addApplyMapping(libraryResult.getProguardMap())
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingVirtualInvokeTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingVirtualInvokeTest.java
index 84a7f62..ff9f9b4 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingVirtualInvokeTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingVirtualInvokeTest.java
@@ -157,7 +157,7 @@
libraryCompileResult.writeToZip(outPath);
testForR8(parameters.getBackend())
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(PROGRAM_CLASSES)
.addApplyMapping(libraryCompileResult.getProguardMap())
.addClasspathClasses(LIBRARY_CLASSES)
diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/shared/NameClashTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/shared/NameClashTest.java
index 3466e21..5d1c231 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/shared/NameClashTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/shared/NameClashTest.java
@@ -139,7 +139,7 @@
.addKeepMainRule(MAIN)
.addKeepRules("-applymapping " + mappingFile)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.compile()
.run(MAIN)
.assertSuccessWithOutput(EXPECTED_OUTPUT);
diff --git a/src/test/java/com/android/tools/r8/naming/arraytypes/ArrayTypesTest.java b/src/test/java/com/android/tools/r8/naming/arraytypes/ArrayTypesTest.java
index 8100e16..031571e 100644
--- a/src/test/java/com/android/tools/r8/naming/arraytypes/ArrayTypesTest.java
+++ b/src/test/java/com/android/tools/r8/naming/arraytypes/ArrayTypesTest.java
@@ -102,7 +102,7 @@
.addProgramClassFileData(generateTestClass())
.addKeepMainRule(Main.class)
.addKeepRules("-applymapping " + mappingFile.toAbsolutePath())
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/naming/signature/SignatureOfMergedClassesTest.java b/src/test/java/com/android/tools/r8/naming/signature/SignatureOfMergedClassesTest.java
index 7511e28..5f58326 100644
--- a/src/test/java/com/android/tools/r8/naming/signature/SignatureOfMergedClassesTest.java
+++ b/src/test/java/com/android/tools/r8/naming/signature/SignatureOfMergedClassesTest.java
@@ -61,7 +61,7 @@
.addKeepClassRules(InterfaceToKeep.class, ImplI.class, K.class)
.addKeepAttributes("Signature, InnerClasses, EnclosingMethod, *Annotation*")
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
internalOptions -> {
internalOptions.enableUnusedInterfaceRemoval = false;
@@ -92,7 +92,7 @@
.addKeepClassRules(InterfaceToKeep.class)
.addKeepAttributes("Signature, InnerClasses, EnclosingMethod, *Annotation*")
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(
internalOptions -> {
internalOptions.enableUnusedInterfaceRemoval = false;
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CheckNotZeroMethodWithArgumentRemovalTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CheckNotZeroMethodWithArgumentRemovalTest.java
index 3685b5c..20b82f0 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CheckNotZeroMethodWithArgumentRemovalTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/CheckNotZeroMethodWithArgumentRemovalTest.java
@@ -39,7 +39,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantReturnAfterArgumentPropagationTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantReturnAfterArgumentPropagationTest.java
index ba07988..3e410db 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantReturnAfterArgumentPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantReturnAfterArgumentPropagationTest.java
@@ -38,7 +38,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantUnboxedEnumArgumentTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantUnboxedEnumArgumentTest.java
index 7c4f463..562c3b5 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantUnboxedEnumArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ConstantUnboxedEnumArgumentTest.java
@@ -41,7 +41,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/EffectivelyFinalCompanionMethodsTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/EffectivelyFinalCompanionMethodsTest.java
index 67af262..86ab638 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/EffectivelyFinalCompanionMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/EffectivelyFinalCompanionMethodsTest.java
@@ -42,7 +42,7 @@
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MixedArgumentRemovalAndEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MixedArgumentRemovalAndEnumUnboxingTest.java
index 71d2f1c..65c3ce8 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MixedArgumentRemovalAndEnumUnboxingTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MixedArgumentRemovalAndEnumUnboxingTest.java
@@ -41,7 +41,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicMethodWithUnusedReturnValueTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicMethodWithUnusedReturnValueTest.java
index d7130ef..0df2eff 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicMethodWithUnusedReturnValueTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/MonomorphicMethodWithUnusedReturnValueTest.java
@@ -38,7 +38,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with proto changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterTypeStrengtheningTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterTypeStrengtheningTest.java
index 91abde9..42d8535 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterTypeStrengtheningTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ParameterTypeStrengtheningTest.java
@@ -42,7 +42,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithUnusedReturnValueTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithUnusedReturnValueTest.java
index e8007c3..fcf44bb 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithUnusedReturnValueTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/PolymorphicMethodWithUnusedReturnValueTest.java
@@ -40,7 +40,7 @@
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with proto changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ReturnTypeStrengtheningTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ReturnTypeStrengtheningTest.java
index 89dccdb..b1faa74 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ReturnTypeStrengtheningTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/ReturnTypeStrengtheningTest.java
@@ -44,7 +44,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentTest.java
index 9b1429f..cee9ab5 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentTest.java
@@ -41,7 +41,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentThroughCallChainTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentThroughCallChainTest.java
index e33fe2a..1764b30 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentThroughCallChainTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/StaticMethodWithConstantArgumentThroughCallChainTest.java
@@ -41,7 +41,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UnboxedEnumUserInMethodWithConstantArgumentTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UnboxedEnumUserInMethodWithConstantArgumentTest.java
index 9a991c2..dd93e33 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UnboxedEnumUserInMethodWithConstantArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UnboxedEnumUserInMethodWithConstantArgumentTest.java
@@ -41,7 +41,7 @@
.addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsArgumentPropagationToResolvedMethodTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsArgumentPropagationToResolvedMethodTest.java
index dd1d2d2..993ca6b 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsArgumentPropagationToResolvedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsArgumentPropagationToResolvedMethodTest.java
@@ -46,7 +46,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with argument removal.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptMethodTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptMethodTest.java
index 5f30d86..12d62c9 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithKeptMethodTest.java
@@ -41,7 +41,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with proto changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithLibraryOverrideTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithLibraryOverrideTest.java
index 31a766e..1e6a4e5 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithLibraryOverrideTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithLibraryOverrideTest.java
@@ -40,7 +40,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with proto changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithParameterAnnotationsTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithParameterAnnotationsTest.java
index 37bfc73..e4507b5 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithParameterAnnotationsTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithParameterAnnotationsTest.java
@@ -47,7 +47,7 @@
.enableInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with proto changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithVirtualMethodCollisionTest.java b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithVirtualMethodCollisionTest.java
index 0e63441..de0dfe3 100644
--- a/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithVirtualMethodCollisionTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/proto/ProtoNormalizationWithVirtualMethodCollisionTest.java
@@ -41,7 +41,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
// TODO(b/173398086): uniqueMethodWithName() does not work with proto changes.
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/regress/Regress181837660.java b/src/test/java/com/android/tools/r8/regress/Regress181837660.java
index d1275c8..0ce8797 100644
--- a/src/test/java/com/android/tools/r8/regress/Regress181837660.java
+++ b/src/test/java/com/android/tools/r8/regress/Regress181837660.java
@@ -98,7 +98,7 @@
testBuilder
// Link against android.jar that contains ReflectiveOperationException.
.addLibraryFiles(parameters.getDefaultAndroidJarAbove(AndroidApiLevel.K))
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel());
}
diff --git a/src/test/java/com/android/tools/r8/regress/b151964517/ConstStringWithMonitorTest.java b/src/test/java/com/android/tools/r8/regress/b151964517/ConstStringWithMonitorTest.java
index c37953b..31fcbef 100644
--- a/src/test/java/com/android/tools/r8/regress/b151964517/ConstStringWithMonitorTest.java
+++ b/src/test/java/com/android/tools/r8/regress/b151964517/ConstStringWithMonitorTest.java
@@ -27,7 +27,7 @@
public void regress() throws Exception {
testForR8(parameters.getBackend())
.addInnerClasses(ConstStringWithMonitorTest.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.allowAccessModification()
.addKeepMainRule(TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/regress/b158429654/InliningNonAccessible.java b/src/test/java/com/android/tools/r8/regress/b158429654/InliningNonAccessible.java
index dfed133..9cebb80 100644
--- a/src/test/java/com/android/tools/r8/regress/b158429654/InliningNonAccessible.java
+++ b/src/test/java/com/android/tools/r8/regress/b158429654/InliningNonAccessible.java
@@ -32,7 +32,7 @@
.addProgramClasses(OuterAbstract.class, OuterImpl.class, InnerClass.class)
.addProgramClasses(Main.class)
.addKeepMainRule(Main.class)
- .noMinification()
+ .addDontObfuscate()
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputLines("42");
}
diff --git a/src/test/java/com/android/tools/r8/regress/b158432019/StaticizerSyntheticUseTest.java b/src/test/java/com/android/tools/r8/regress/b158432019/StaticizerSyntheticUseTest.java
index e07f8f1..8fde692 100644
--- a/src/test/java/com/android/tools/r8/regress/b158432019/StaticizerSyntheticUseTest.java
+++ b/src/test/java/com/android/tools/r8/regress/b158432019/StaticizerSyntheticUseTest.java
@@ -42,7 +42,7 @@
.addProgramClasses(Singleton.class, Main.class, Sam.class, A.class)
.addKeepClassAndMembersRules(Main.class)
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java b/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java
index ced781f..a3ce92b 100644
--- a/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java
+++ b/src/test/java/com/android/tools/r8/regress/b63935662/Regress63935662.java
@@ -36,7 +36,7 @@
testBuilder
.addKeepRuleFiles()
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.run(parameters.getRuntime(), mainClass)
diff --git a/src/test/java/com/android/tools/r8/regress/b69825683/Regress69825683Test.java b/src/test/java/com/android/tools/r8/regress/b69825683/Regress69825683Test.java
index eb1e0bf..e0a469c 100644
--- a/src/test/java/com/android/tools/r8/regress/b69825683/Regress69825683Test.java
+++ b/src/test/java/com/android/tools/r8/regress/b69825683/Regress69825683Test.java
@@ -55,7 +55,7 @@
" synthetic void <init>(...);",
"}")
.addOptionsModification(options -> options.enableClassInlining = false)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), outer)
// Run code to check that the constructor with synthetic class as argument is present.
@@ -82,7 +82,7 @@
"-assumemayhavesideeffects class " + clazz.getName() + " {",
" void <init>(...);",
"}")
- .noMinification()
+ .addDontObfuscate()
.addOptionsModification(o -> o.enableClassInlining = false)
.setMinApi(parameters.getApiLevel())
// Run code to check that the constructor with synthetic class as argument is present.
diff --git a/src/test/java/com/android/tools/r8/regress/b76025099/B76025099.java b/src/test/java/com/android/tools/r8/regress/b76025099/B76025099.java
index e179440..79eadb7 100644
--- a/src/test/java/com/android/tools/r8/regress/b76025099/B76025099.java
+++ b/src/test/java/com/android/tools/r8/regress/b76025099/B76025099.java
@@ -62,7 +62,7 @@
testForProguard()
.addProgramFiles(ToolHelper.getClassFilesForTestPackage(Main.class.getPackage()))
.addKeepMainRule(Main.class)
- .noMinification()
+ .addDontObfuscate()
.compile();
if (parameters.isDexRuntime()) {
@@ -86,7 +86,7 @@
.addProgramFiles(ToolHelper.getClassFilesForTestPackage(Main.class.getPackage()))
.addKeepMainRule(Main.class)
.enableNoVerticalClassMergingAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::verifyFieldAccess)
diff --git a/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java b/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
index 7028257..b2b9dad 100644
--- a/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
+++ b/src/test/java/com/android/tools/r8/regress/b78493232/Regress78493232_WithPhi.java
@@ -90,7 +90,7 @@
.addProgramClassFileData(CLASS_BYTES)
.allowDiagnosticWarningMessages()
.treeShaking(treeShake)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.addOptionsModification(options -> options.testing.readInputStackMaps = false)
.addKeepMainRule(MAIN)
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java
index 39b3d43..658822d 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageDontObfuscateTest.java
@@ -61,7 +61,7 @@
.apply(this::configureRepackaging)
.addInliningAnnotations()
.addDontWarn(RepackageDontObfuscateTest.class)
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(
inspector -> {
@@ -106,7 +106,7 @@
.addKeepMainRule(Main.class)
.enableInliningAnnotations()
.apply(this::configureRepackaging)
- .noMinification()
+ .addDontObfuscate()
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/resolution/SingleTargetExecutionTest.java b/src/test/java/com/android/tools/r8/resolution/SingleTargetExecutionTest.java
index 4726fe4..12b9676 100644
--- a/src/test/java/com/android/tools/r8/resolution/SingleTargetExecutionTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/SingleTargetExecutionTest.java
@@ -69,7 +69,7 @@
@Test
public void testR8() throws Exception {
testForR8(parameters.getBackend())
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(CLASSES)
.addProgramClassFileData(ASM_CLASSES)
.addKeepMainRule(Main.class)
diff --git a/src/test/java/com/android/tools/r8/resolution/interfacetargets/ProgramAndLibraryDefinitionTest.java b/src/test/java/com/android/tools/r8/resolution/interfacetargets/ProgramAndLibraryDefinitionTest.java
index 8494f39..e76a5b6 100644
--- a/src/test/java/com/android/tools/r8/resolution/interfacetargets/ProgramAndLibraryDefinitionTest.java
+++ b/src/test/java/com/android/tools/r8/resolution/interfacetargets/ProgramAndLibraryDefinitionTest.java
@@ -72,7 +72,7 @@
.addDontWarn(A.class, B.class)
.addKeepMainRule(Main.class)
.addOptionsModification(options -> options.loadAllClassDefinitions = true)
- .noMinification()
+ .addDontObfuscate()
.allowUnusedDontWarnPatterns();
byte[] libraryA = getAFromClassTestParam(this.aInLibrary);
addIfNotNull(libraryA, testBuilder::addLibraryClassFileData);
diff --git a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
index 3d3331b..8eb9f47 100644
--- a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
+++ b/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
@@ -99,7 +99,7 @@
.setMode(CompilationMode.RELEASE)
.addKeepMainRule(MAIN)
.allowDiagnosticWarningMessages()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."))
diff --git a/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java b/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
index 33394dd..8a6035c 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
@@ -84,7 +84,7 @@
}
})
// TODO(b/136633154): This should work both with and without -dontobfuscate.
- .noMinification()
+ .addDontObfuscate()
// TODO(b/136633154): This should work both with and without -dontshrink.
.noTreeShaking()
.compile()
diff --git a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
index cd7964f..76fe6b6 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ServiceLoaderRewritingTest.java
@@ -282,7 +282,7 @@
.addKeepMainRule(EscapingRunner.class)
.enableInliningAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.addDataEntryResources(
DataEntryResource.fromBytes(
StringUtils.lines(ServiceImpl.class.getTypeName()).getBytes(),
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
index 837b449..e5e3b29 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
@@ -190,7 +190,7 @@
.addKeepMainRule(ClassWithAssertions.class)
.addOptionsModification(o -> o.inlinerOptions().enableInlining = false)
.allowAccessModification()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(minApi)
.compile();
}
@@ -202,7 +202,7 @@
.addProgramClasses(ClassWithAssertions.class)
.debug()
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.addAssertionsConfiguration(transformation)
.compile();
}
@@ -226,7 +226,7 @@
.setMinApi(AndroidApiLevel.B)
.debug()
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(minApi)
.compile();
}
@@ -355,7 +355,7 @@
.debug()
.setMinApi(minApi)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.compile()
.writeToZip();
diff --git a/src/test/java/com/android/tools/r8/rewrite/logarguments/LogArgumentsTest.java b/src/test/java/com/android/tools/r8/rewrite/logarguments/LogArgumentsTest.java
index 3e69d0b..8f37d3d 100644
--- a/src/test/java/com/android/tools/r8/rewrite/logarguments/LogArgumentsTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/logarguments/LogArgumentsTest.java
@@ -36,7 +36,7 @@
.addOptionsModification(
options -> options.logArgumentsFilter = ImmutableList.of(qualifiedMethodName))
.assumeAllMethodsMayHaveSideEffects()
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.run(TestStatic.class)
.getStdOut();
@@ -57,7 +57,7 @@
.addOptionsModification(
options -> options.logArgumentsFilter = ImmutableList.of(qualifiedMethodName))
.assumeAllMethodsMayHaveSideEffects()
- .noMinification()
+ .addDontObfuscate()
.noTreeShaking()
.run(TestInstance.class)
.getStdOut();
diff --git a/src/test/java/com/android/tools/r8/rewrite/staticvalues/inlibraries/StaticLibraryValuesChangeTest.java b/src/test/java/com/android/tools/r8/rewrite/staticvalues/inlibraries/StaticLibraryValuesChangeTest.java
index 16691d8..dc1d864 100644
--- a/src/test/java/com/android/tools/r8/rewrite/staticvalues/inlibraries/StaticLibraryValuesChangeTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/staticvalues/inlibraries/StaticLibraryValuesChangeTest.java
@@ -83,11 +83,12 @@
.addProgramClasses(TestMain.class)
.addLibraryFiles(ToolHelper.getDefaultAndroidJar())
// Compile TestMain with R8 using the second version of LibraryClass as library.
- .addLibraryProvider(PreloadedClassFileProvider.fromClassData(
- DescriptorUtils.javaTypeToDescriptor(LibraryClass.class.getName()),
- compileTimeLibrary.buildClasses().get(0)))
+ .addLibraryProvider(
+ PreloadedClassFileProvider.fromClassData(
+ DescriptorUtils.javaTypeToDescriptor(LibraryClass.class.getName()),
+ compileTimeLibrary.buildClasses().get(0)))
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.compile()
// Merge the compiled TestMain with the runtime version of LibraryClass.
.addRunClasspathFiles(lib)
diff --git a/src/test/java/com/android/tools/r8/shaking/FunctionTest.java b/src/test/java/com/android/tools/r8/shaking/FunctionTest.java
index 39169a1..eda629d 100644
--- a/src/test/java/com/android/tools/r8/shaking/FunctionTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/FunctionTest.java
@@ -43,7 +43,7 @@
testForR8(parameters.getBackend())
.addKeepMainRule(TestClass.class)
.noTreeShaking()
- .noMinification()
+ .addDontObfuscate()
.enableInliningAnnotations()
.addInnerClasses(FunctionTest.class)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java b/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java
index eeb91af..e38943c 100644
--- a/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ParameterTypeTest.java
@@ -314,7 +314,7 @@
options.inlinerOptions().enableInlining = false;
options.callSiteOptimizationOptions().setEnabled(enableArgumentPropagation);
})
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(
diff --git a/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/ConfigurationDebuggingTest.java b/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/ConfigurationDebuggingTest.java
index c7630ba..ac46b3f 100644
--- a/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/ConfigurationDebuggingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/addconfigurationdebugging/ConfigurationDebuggingTest.java
@@ -109,7 +109,7 @@
.addProgramClasses(BaseClass.class, UninstantiatedClass.class, TestClass.class)
.addKeepRules("-addconfigurationdebugging")
.addKeepRules("-keep class **.TestClass { <init>(); }")
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(this::inspect)
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java
index d737c41..35dace2 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/AnnotationsOnTargetedMethodTest.java
@@ -90,7 +90,7 @@
.enableNeverClassInliningAnnotations()
.enableNoHorizontalClassMergingAnnotations()
.enableNoVerticalClassMergingAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutput(
diff --git a/src/test/java/com/android/tools/r8/shaking/annotations/SerializedNameAlternateTest.java b/src/test/java/com/android/tools/r8/shaking/annotations/SerializedNameAlternateTest.java
index de259e5..7d2173f 100644
--- a/src/test/java/com/android/tools/r8/shaking/annotations/SerializedNameAlternateTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/annotations/SerializedNameAlternateTest.java
@@ -91,7 +91,7 @@
" @" + SerializedName.class.getTypeName() + " <fields>;",
"}")
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.run(parameters.getRuntime(), Main.class);
checkRunResult(result);
}
@@ -107,7 +107,7 @@
.addKeepMainRule(Main.class)
.addKeepClassRules(Foo.class)
.addKeepClassRules(SerializedName.class)
- .noMinification()
+ .addDontObfuscate()
.addKeepRules("-dontwarn")
.run(parameters.getRuntime(), Main.class);
checkRunResult(result);
diff --git a/src/test/java/com/android/tools/r8/shaking/array/DeadArrayLengthTest.java b/src/test/java/com/android/tools/r8/shaking/array/DeadArrayLengthTest.java
index 03d5aa6..a4ba893 100644
--- a/src/test/java/com/android/tools/r8/shaking/array/DeadArrayLengthTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/array/DeadArrayLengthTest.java
@@ -78,7 +78,7 @@
.addKeepMainRule(MAIN)
.enableInliningAnnotations()
.enableMemberValuePropagationAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(EXPECTED_OUTPUT)
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationTest.java
index b73fc3e..5d95ca0 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationTest.java
@@ -153,7 +153,7 @@
options ->
options.horizontalClassMergerOptions().enableIf(enableHorizontalClassMerging))
.enableInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(config.expectedOutput(enableHorizontalClassMerging));
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithSuperCallTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithSuperCallTest.java
index fa8d22b..a97890a 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithSuperCallTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithSuperCallTest.java
@@ -76,7 +76,7 @@
.addInnerClasses(AssumenosideeffectsPropagationWithSuperCallTest.class)
.addKeepMainRule(MAIN)
.addKeepRules(config.getKeepRules())
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(config.expectedOutput(parameters));
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithoutMatchingDefinitionTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithoutMatchingDefinitionTest.java
index e4edf08..ad79ff7 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithoutMatchingDefinitionTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsPropagationWithoutMatchingDefinitionTest.java
@@ -52,7 +52,7 @@
"-assumenosideeffects class * implements " + LoggerInterface.class.getTypeName() + " {",
" *** debug(...);",
"}")
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(OUTPUT_WITHOUT_LOGGING)
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsVisibleMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsVisibleMethodsTest.java
index 6b053ee..73151e0 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsVisibleMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsVisibleMethodsTest.java
@@ -156,7 +156,7 @@
.addProgramClasses(ProgramBase.class, ProgramSub.class, MAIN)
.addKeepMainRule(MAIN)
.addKeepRules(config.getKeepRule())
- .noMinification()
+ .addDontObfuscate()
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithMultipleTargetsTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithMultipleTargetsTest.java
index daaacb2..41311d2 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithMultipleTargetsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithMultipleTargetsTest.java
@@ -98,7 +98,7 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules(config.getKeepRule())
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(TestConfig.OUTPUT_WITHOUT_INFO)
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithoutMatchingDefinitionTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithoutMatchingDefinitionTest.java
index 010af23..0bd97f8 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithoutMatchingDefinitionTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithoutMatchingDefinitionTest.java
@@ -114,7 +114,7 @@
.addProgramClasses(MAIN)
.addKeepMainRule(MAIN)
.addKeepRules(config.getKeepRule())
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.compile()
.addRunClasspathFiles(parameters.isDexRuntime() ? libDexPath : libJarPath)
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithoutReturnValueTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithoutReturnValueTest.java
index 3596b42..352a53c 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithoutReturnValueTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/AssumenosideeffectsWithoutReturnValueTest.java
@@ -73,7 +73,7 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules(config.getKeepRules())
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.compile()
.inspect(this::verifyDebugMethodIsRemoved)
diff --git a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/StringBuildersAfterAssumenosideeffectsTest.java b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/StringBuildersAfterAssumenosideeffectsTest.java
index b80febc..ca28f14 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/StringBuildersAfterAssumenosideeffectsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumenosideeffects/StringBuildersAfterAssumenosideeffectsTest.java
@@ -50,7 +50,7 @@
"-assumenosideeffects class * implements " + TestLogger.class.getTypeName() + " {",
" void info(...);",
"}")
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(EXPECTED)
diff --git a/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumevaluesWithMultipleTargetsTest.java b/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumevaluesWithMultipleTargetsTest.java
index eb205d0..a6d7d67 100644
--- a/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumevaluesWithMultipleTargetsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/assumevalues/AssumevaluesWithMultipleTargetsTest.java
@@ -159,7 +159,7 @@
.enableInliningAnnotations()
.addKeepMainRule(MAIN)
.addKeepRules(config.getKeepRule())
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), MAIN)
.assertSuccessWithOutput(TestConfig.OUTPUT_WITH_FULL_REPLACEMENT)
diff --git a/src/test/java/com/android/tools/r8/shaking/attributes/InnerClassesSimpleTest.java b/src/test/java/com/android/tools/r8/shaking/attributes/InnerClassesSimpleTest.java
index 0474186..41de889 100644
--- a/src/test/java/com/android/tools/r8/shaking/attributes/InnerClassesSimpleTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/attributes/InnerClassesSimpleTest.java
@@ -41,7 +41,7 @@
.addKeepMainRule(Main.class)
.addKeepPackageNamesRule(getClass().getPackage())
.noTreeShaking()
- .applyIf(!minify, TestShrinkerBuilder::noMinification)
+ .applyIf(!minify, TestShrinkerBuilder::addDontObfuscate)
.compile()
.writeToZip();
testForR8(parameters.getBackend())
diff --git a/src/test/java/com/android/tools/r8/shaking/b136698023/LibraryBridgeTest.java b/src/test/java/com/android/tools/r8/shaking/b136698023/LibraryBridgeTest.java
index baba02c..45286b6 100644
--- a/src/test/java/com/android/tools/r8/shaking/b136698023/LibraryBridgeTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/b136698023/LibraryBridgeTest.java
@@ -101,7 +101,7 @@
.addProgramClasses(ICloneable.class, BaseOrdinaryClone.class, MainWithOrdinaryClone.class)
.addKeepClassAndMembersRules(ICloneable.class)
.addKeepMainRule(MainWithOrdinaryClone.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MainWithOrdinaryClone.class)
.assertSuccessWithOutputThatMatches(containsString(BaseOrdinaryClone.class.getTypeName()));
@@ -114,7 +114,7 @@
.addProgramClasses(XCloneable.class, Model.class, Main.class, Base.class)
.addKeepClassAndMembersRules(XCloneable.class, Base.class)
.addKeepMainRule(Main.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), Main.class)
.assertSuccessWithOutputThatMatches(containsString(Model.class.getTypeName()));
@@ -127,7 +127,7 @@
.addProgramClasses(XCloneable.class, ModelImpl.class, MainImpl.class, Base.class)
.addKeepClassAndMembersRules(XCloneable.class, Base.class)
.addKeepMainRule(MainImpl.class)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.run(parameters.getRuntime(), MainImpl.class)
.assertSuccessWithOutputThatMatches(containsString(Model.class.getTypeName()));
@@ -149,7 +149,7 @@
.addKeepClassAndMembersRules(XCloneable.class)
.addKeepMainRule(Main.class)
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.addRunClasspathFiles(library.writeToZip())
.run(parameters.getRuntime(), Main.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/b136698023/ProgramInterfaceNotImplementedTest.java b/src/test/java/com/android/tools/r8/shaking/b136698023/ProgramInterfaceNotImplementedTest.java
index 0d41b96..970dd1e 100644
--- a/src/test/java/com/android/tools/r8/shaking/b136698023/ProgramInterfaceNotImplementedTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/b136698023/ProgramInterfaceNotImplementedTest.java
@@ -127,7 +127,7 @@
.addProgramClasses(I.class, clazz, main)
.addKeepClassAndMembersRules(I.class)
.addKeepMainRule(main)
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getRuntime())
.run(parameters.getRuntime(), main)
.assertSuccessWithOutputThatMatches(containsString(clazz.getTypeName()))
@@ -155,7 +155,7 @@
.addKeepClassAndMembersRules(I.class)
.addKeepMainRule(MainD.class)
.setMinApi(parameters.getRuntime())
- .noMinification()
+ .addDontObfuscate()
.compile()
.addRunClasspathFiles(library.writeToZip())
.run(parameters.getRuntime(), MainD.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/b169045091/B169045091.java b/src/test/java/com/android/tools/r8/shaking/b169045091/B169045091.java
index e8f8091..fdec859 100644
--- a/src/test/java/com/android/tools/r8/shaking/b169045091/B169045091.java
+++ b/src/test/java/com/android/tools/r8/shaking/b169045091/B169045091.java
@@ -59,7 +59,7 @@
.enableInliningAnnotations()
.enableNoVerticalClassMergingAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.run(parameters.getRuntime(), TestClass.class)
.assertSuccessWithOutputLines("Hello world!");
diff --git a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByImplementationTest.java b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByImplementationTest.java
index dcb962b..eecee11 100644
--- a/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByImplementationTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/clinit/InterfaceInitializedByImplementationTest.java
@@ -46,7 +46,7 @@
.enableInliningAnnotations()
.enableNoMethodStaticizingAnnotations()
.setMinApi(parameters.getApiLevel())
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(this::inspect)
.run(parameters.getRuntime(), TestClass.class)
diff --git a/src/test/java/com/android/tools/r8/shaking/defaultmethods/DefaultMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/defaultmethods/DefaultMethodsTest.java
index 0a54cf8..ae783ee 100644
--- a/src/test/java/com/android/tools/r8/shaking/defaultmethods/DefaultMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/defaultmethods/DefaultMethodsTest.java
@@ -51,7 +51,7 @@
.setMinApi(parameters.getApiLevel())
.addKeepMainRule(TestClass.class)
.addKeepRules(additionalKeepRules)
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(inspection);
}
diff --git a/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java b/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java
index c736dc1..8431fcb 100644
--- a/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java
@@ -49,7 +49,7 @@
}
testForR8(parameters.getBackend())
// Disable minification so that A still refers to A given on the classpath below.
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(TestClass.class, A.class)
.addKeepMainRule(TestClass.class)
.setMinApi(parameters.getApiLevel())
diff --git a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java
index e00615a..48f0372 100644
--- a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ForceProguardCompatibilityTest.java
@@ -82,7 +82,7 @@
throws Exception {
CodeInspector inspector =
testForR8Compat(parameters.getBackend(), forceProguardCompatibility)
- .noMinification()
+ .addDontObfuscate()
.allowAccessModification()
.addProgramClasses(mainClass, mentionedClass)
.addKeepMainRule(mainClass)
diff --git a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/keepinterface/CompatKeepInterfaceAsInstantiatedTest.java b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/keepinterface/CompatKeepInterfaceAsInstantiatedTest.java
index 38a6b4f..c68e841 100644
--- a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/keepinterface/CompatKeepInterfaceAsInstantiatedTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/keepinterface/CompatKeepInterfaceAsInstantiatedTest.java
@@ -130,7 +130,7 @@
.applyIf(
builder.isProguardTestBuilder(),
b -> b.addDontWarn(CompatKeepInterfaceAsInstantiatedTest.class))
- .noMinification()
+ .addDontObfuscate()
.addProgramClasses(main, Foo.class)
.addKeepMainRule(main)
.compile()
diff --git a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java
index a482eee..385f32f 100644
--- a/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ifrule/verticalclassmerging/MergedTypeBaseTest.java
@@ -104,7 +104,7 @@
getConditionForProguardIfRule(),
"-keep class " + Unused.class.getTypeName(),
getAdditionalKeepRules())
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.apply(this::configure)
.run(parameters.getRuntime(), getTestClass())
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/DefaultInterfaceMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/DefaultInterfaceMethodsTest.java
index f75f7bd..aa1fe71 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/DefaultInterfaceMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/DefaultInterfaceMethodsTest.java
@@ -72,7 +72,7 @@
.addKeepMethodRules(J.class, "void foo()")
.addOptionsModification(
internalOptions -> internalOptions.enableVerticalClassMerging = false)
- .noMinification()
+ .addDontObfuscate()
.compile();
// TODO(b/144269679): We should be able to compile and run this.
testForR8(parameters.getBackend())
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceDefaultMethodKeptTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceDefaultMethodKeptTest.java
index b7b517b..91f4153 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceDefaultMethodKeptTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/InterfaceDefaultMethodKeptTest.java
@@ -95,7 +95,7 @@
.setMinApi(parameters.getApiLevel())
.addKeepMethodRules(A.class, "void <init>()", "void foo()")
.addKeepMethodRules(B.class, "void <init>()", "void foo()")
- .noMinification()
+ .addDontObfuscate()
.compile()
.inspect(
codeInspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleTargetTest.java b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleTargetTest.java
index 7e11e46..1fdd5d1 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleTargetTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/interfaces/MultipleTargetTest.java
@@ -54,7 +54,7 @@
.addProgramClasses(Top.class, Left.class, Right.class, Bottom.class)
.setMinApi(parameters.getApiLevel())
.addKeepMethodRules(Bottom.class, "java.lang.String name()")
- .noMinification()
+ .addDontObfuscate()
.compile();
// TODO(b/144269679): We should be able to compile and run this.
testForR8(parameters.getBackend())
diff --git a/src/test/java/com/android/tools/r8/shaking/modifiers/SyntheticAndBridgeModifiersTest.java b/src/test/java/com/android/tools/r8/shaking/modifiers/SyntheticAndBridgeModifiersTest.java
index 4ef106c..6570f3f 100644
--- a/src/test/java/com/android/tools/r8/shaking/modifiers/SyntheticAndBridgeModifiersTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/modifiers/SyntheticAndBridgeModifiersTest.java
@@ -27,28 +27,30 @@
testForProguard()
.addProgramClasses(CLASSES)
.addKeepRules(keepRules)
- .noMinification()
+ .addDontObfuscate()
.compile()
.disassemble()
- .inspect(inspector -> {
- ClassSubject clazz =
- inspector.clazz(SyntheticAndBridgeModifiersTestClass.TestClass.class);
- assertThat(clazz, isPresent());
- classConsumer.accept(clazz);
- });
+ .inspect(
+ inspector -> {
+ ClassSubject clazz =
+ inspector.clazz(SyntheticAndBridgeModifiersTestClass.TestClass.class);
+ assertThat(clazz, isPresent());
+ classConsumer.accept(clazz);
+ });
testForR8(Backend.DEX)
.addProgramClasses(CLASSES)
.addKeepRules(keepRules)
- .noMinification()
+ .addDontObfuscate()
.compile()
.disassemble()
- .inspect(inspector -> {
- ClassSubject clazz =
- inspector.clazz(SyntheticAndBridgeModifiersTestClass.TestClass.class);
- assertThat(clazz, isPresent());
- classConsumer.accept(clazz);
- });
+ .inspect(
+ inspector -> {
+ ClassSubject clazz =
+ inspector.clazz(SyntheticAndBridgeModifiersTestClass.TestClass.class);
+ assertThat(clazz, isPresent());
+ classConsumer.accept(clazz);
+ });
}
private long methodsWithNameStartingWith(ClassSubject clazz, String prefix) {
diff --git a/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedKeepRulesTest.java b/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedKeepRulesTest.java
index 0468d27..57e37fe 100644
--- a/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedKeepRulesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedKeepRulesTest.java
@@ -333,7 +333,7 @@
return testBuilder
.addProgramClasses(A.class, B.class, C.class, D.class, FooBar.class, BarBar.class)
.setMinApi(AndroidApiLevel.B)
- .noMinification()
+ .addDontObfuscate()
.compile();
}
diff --git a/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedMethodArgumentTest.java b/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedMethodArgumentTest.java
index b4d6576..2fabb47 100644
--- a/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedMethodArgumentTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/negatedrules/NegatedMethodArgumentTest.java
@@ -76,7 +76,7 @@
.addKeepMainRule(TestClass.class)
.addKeepRules("-keep class * { void setX(!%); }")
.addKeepRules("-dontwarn **.NegatedMethodArgumentTest")
- .noMinification()
+ .addDontObfuscate()
.run(parameters.getRuntime(), TestClass.class)
.inspect(
inspector -> {
@@ -94,7 +94,7 @@
.addKeepMainRule(TestClass.class)
.addKeepRules("-keep class * { void setX(!**.*P1); }")
.addKeepRules("-dontwarn **.NegatedMethodArgumentTest")
- .noMinification()
+ .addDontObfuscate()
.run(parameters.getRuntime(), TestClass.class)
.inspect(
inspector -> {
diff --git a/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java b/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java
index 047a109..75b74e6 100644
--- a/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/proxy/ProxiesTest.java
@@ -67,7 +67,7 @@
o.enableDevirtualization = false;
})
.enableAlwaysInliningAnnotations()
- .noMinification()
+ .addDontObfuscate()
.setMinApi(parameters.getApiLevel())
.compile()
.inspect(inspection)