Fix test breakage, which tests build flags to be canonical, by maintaining --android_resource_shrinking and --experimental_android_resource_shrinking as separate flags that affect the same behavior, instead of utilizing the 'oldName' feature of Options.

RELNOTES:

--
PiperOrigin-RevId: 146024304
MOS_MIGRATED_REVID=146024304

1 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index 65445a41f6..7833f5f66c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -355,8 +355,13 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
             + " rules with deps. The depot needs to be cleaned up to roll this out by default.")
     public boolean allowAndroidLibraryDepsWithoutSrcs;
 
+    @Option(name = "experimental_android_resource_shrinking",
+        defaultValue = "false",
+        category = "undocumented",
+        help = "Enables resource shrinking for android_binary APKs that use ProGuard.")
+    public boolean useExperimentalAndroidResourceShrinking;
+
     @Option(name = "android_resource_shrinking",
-        oldName = "experimental_android_resource_shrinking",
         defaultValue = "false",
         category = "semantics",
         help = "Enables resource shrinking for android_binary APKs that use ProGuard.")
@@ -495,7 +500,8 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
         ImmutableList.copyOf(options.nonIncrementalPerTargetDexopts);
     this.desugarJava8 = options.desugarJava8;
     this.allowAndroidLibraryDepsWithoutSrcs = options.allowAndroidLibraryDepsWithoutSrcs;
-    this.useAndroidResourceShrinking = options.useAndroidResourceShrinking;
+    this.useAndroidResourceShrinking = options.useAndroidResourceShrinking
+        || options.useExperimentalAndroidResourceShrinking;
     this.useParallelResourceProcessing = options.useParallelResourceProcessing;
     this.manifestMerger = options.manifestMerger;
     this.apkSigningMethod = options.apkSigningMethod;