commit 8013b1cb1fbce9181d04fa640ae80f31142015f3
author bcsf <bcsf@google.com> Fri Oct 25 14:46:12 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Oct 25 14:47:31 2019 -0700
tree 3900c2853a00aa8797ca035192dfc0bf6005c6be
parent 19c3d975255356071d24eefca2492816f46a00a2

Add allowlist for targets to opt out of resource shrinking.

PiperOrigin-RevId: 276764719

src/main/java/com/google/devtools/build/lib/rules/android/AndroidDataContext.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDataContext.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDataContext.java
index 16b203d..3297fdb 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDataContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDataContext.java
@@ -60,6 +60,7 @@
   private final boolean persistentBusyboxToolsEnabled;
   private final boolean compatibleForResourcePathShortening;
   private final boolean compatibleForResourceNameObfuscation;
+  private final boolean compatibleForResourceShrinking;
   private final boolean throwOnProguardApplyDictionary;
   private final boolean throwOnProguardApplyMapping;
   private final boolean throwOnResourceConflict;
@@ -80,6 +81,7 @@
         AndroidSdkProvider.fromRuleContext(ruleContext),
         lacksAllowlistExemptions(ruleContext, "allow_raw_access_to_resource_paths", true),
         lacksAllowlistExemptions(ruleContext, "allow_resource_name_obfuscation_opt_out", true),
+        lacksAllowlistExemptions(ruleContext, "allow_resource_shrinking_opt_out", true),
         lacksAllowlistExemptions(ruleContext, "allow_proguard_apply_dictionary", false),
         lacksAllowlistExemptions(ruleContext, "allow_proguard_apply_mapping", false),
         lacksAllowlistExemptions(ruleContext, "allow_resource_conflicts", false),
@@ -100,6 +102,7 @@
       AndroidSdkProvider sdk,
       boolean compatibleForResourcePathShortening,
       boolean compatibleForResourceNameObfuscation,
+      boolean compatibleForResourceShrinking,
       boolean throwOnProguardApplyDictionary,
       boolean throwOnProguardApplyMapping,
       boolean throwOnResourceConflict,
@@ -110,6 +113,7 @@
     this.sdk = sdk;
     this.compatibleForResourcePathShortening = compatibleForResourcePathShortening;
     this.compatibleForResourceNameObfuscation = compatibleForResourceNameObfuscation;
+    this.compatibleForResourceShrinking = compatibleForResourceShrinking;
     this.throwOnProguardApplyDictionary = throwOnProguardApplyDictionary;
     this.throwOnProguardApplyMapping = throwOnProguardApplyMapping;
     this.throwOnResourceConflict = throwOnResourceConflict;
@@ -196,6 +200,10 @@
     return compatibleForResourceNameObfuscation;
   }
 
+  public boolean compatibleForResourceShrinking() {
+    return compatibleForResourceShrinking;
+  }
+
   public boolean throwOnProguardApplyDictionary() {
     return throwOnProguardApplyDictionary;
   }
@@ -240,7 +248,7 @@
       state = getAndroidConfig().useAndroidResourceShrinking() ? TriState.YES : TriState.NO;
     }
 
-    return state == TriState.YES;
+    return state == TriState.YES && compatibleForResourceShrinking;
   }
 
   boolean useResourcePathShortening() {