Add testing option for repackaging with no minification
Change-Id: Ida88fbc03b2075b845046b7990fd8fad3ab90970
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index bd02d0f..cecd8b8 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -570,7 +570,8 @@
@Override
public boolean isRepackagingEnabled() {
- return proguardConfiguration.getPackageObfuscationMode().isSome() && isMinifying();
+ return proguardConfiguration.getPackageObfuscationMode().isSome()
+ && (isMinifying() || testing.repackageWithNoMinification);
}
@Override
@@ -1319,6 +1320,7 @@
// TODO(b/177333791): Set to true
public boolean checkForNotExpandingMainDexTracingResult = false;
public Set<String> allowedUnusedDontWarnPatterns = new HashSet<>();
+ public boolean repackageWithNoMinification = false;
public boolean allowConflictingSyntheticTypes = false;
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithSuffixRenamingConfigurationTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithSuffixRenamingConfigurationTest.java
index b22042f..dcfd6c3 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithSuffixRenamingConfigurationTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithSuffixRenamingConfigurationTest.java
@@ -30,10 +30,12 @@
.addKeepMainRule(TestClass.class)
.addKeepClassRules(GreeterFoo.class)
.addOptionsModification(
- options ->
- options.testing.repackagingConfigurationFactory =
- appView ->
- new SuffixRenamingRepackagingConfiguration("Foo", appView.dexItemFactory()))
+ options -> {
+ options.testing.repackageWithNoMinification = true;
+ options.testing.repackagingConfigurationFactory =
+ appView ->
+ new SuffixRenamingRepackagingConfiguration("Foo", appView.dexItemFactory());
+ })
.apply(this::configureRepackaging)
.enableInliningAnnotations()
.noMinification()
