Remove enableRepackagingByDefault flag Change-Id: I70e78c7abcd040a647130f0e0816922f94130285

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 0fefd65..fbaa715 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java

@@ -966,9 +966,6 @@
       return getPackageObfuscationModeForNone();
     }
     if (packageObfuscationMode.isDefault()) {
-      if (!getTestingOptions().enableRepackagingByDefault) {
-        return getPackageObfuscationModeForNone();
-      }
       if (isGeneratingClassFiles() && !getTestingOptions().enableRepackagingByDefaultForCf) {
         return getPackageObfuscationModeForNone();
       }
@@ -2535,7 +2532,6 @@
             "com.android.tools.r8.enableMapIdInSourceFile", true);
     public boolean enableMemberRebindingAnalysis = true;
     public boolean enableMultiANewArrayDesugaringForClassFiles = false;
-    public boolean enableRepackagingByDefault = true;
     public boolean enableRepackagingByDefaultForCf = false;
     public boolean enableStrictFrameVerification = false;
     public boolean enableSyntheticSharing = true;

diff --git a/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
index 6ff2f41..4a0a497 100644
--- a/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java

@@ -87,7 +87,6 @@
           options -> {
             options.testing.allowUnusedDontWarnRules = false;
             options.testing.allowUnnecessaryDontWarnWildcards = false;
-            options.testing.enableRepackagingByDefault = true;
             options.testing.enableRepackagingByDefaultForCf = true;
             options.testing.forcePruneMetaInfManifestMf = true;
             options.horizontalClassMergerOptions().enableForTesting();