diff options
| author | Morten Krogh-Jespersen <mkroghj@google.com> | 2021-03-16 18:57:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-16 18:57:23 +0000 |
| commit | 98331e0b99db9f3db07b2bf6dc448d235c86bba5 (patch) | |
| tree | 2644329eb9813a958095d9317dd6b230eec1f841 | |
| parent | d54ec77103992b277e5f583f0e489d4cce9d9db1 (diff) | |
| parent | 02fdf2c3c523063bb514f38066fcffa3141ba34f (diff) | |
| download | r8-98331e0b99db9f3db07b2bf6dc448d235c86bba5.tar.gz | |
Add testing option for repackaging with no minification am: 02fdf2c3c5
Original change: undetermined
Change-Id: I8a2fc6f391f84dd5463f1e577a47deec231de0d1
| -rw-r--r-- | src/main/java/com/android/tools/r8/utils/InternalOptions.java | 4 | ||||
| -rw-r--r-- | src/test/java/com/android/tools/r8/repackage/RepackageWithSuffixRenamingConfigurationTest.java | 10 |
2 files changed, 9 insertions, 5 deletions
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 bd02d0f07..cecd8b8ff 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 @@ public class InternalOptions implements GlobalKeepInfoConfiguration { @Override public boolean isRepackagingEnabled() { - return proguardConfiguration.getPackageObfuscationMode().isSome() && isMinifying(); + return proguardConfiguration.getPackageObfuscationMode().isSome() + && (isMinifying() || testing.repackageWithNoMinification); } @Override @@ -1319,6 +1320,7 @@ public class InternalOptions implements GlobalKeepInfoConfiguration { // 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 b22042f2d..dcfd6c394 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 @@ public class RepackageWithSuffixRenamingConfigurationTest extends RepackageTestB .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() |