Stop filtering resources in analysis in aapt2 builds

aapt2 always gets the complete, unfiltered resources, and then filters them in
execution. Save time by not uselessly filtering in analysis.

RELNOTES: none
PiperOrigin-RevId: 178397137

1 files changed, 2 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
index df468bfa52..8b406cb82d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java
@@ -862,7 +862,7 @@ public final class ApplicationManifest {
       boolean createSource,
       Artifact proguardCfg,
       @Nullable Artifact mainDexProguardCfg)
-      throws InterruptedException {
+      throws InterruptedException, RuleErrorException {
 
     TransitiveInfoCollection resourcesPrerequisite =
         ruleContext.getPrerequisite("resources", Mode.TARGET);
@@ -919,8 +919,7 @@ public final class ApplicationManifest {
     for (String extension : uncompressedExtensions) {
       additionalAaptOpts.add("-0").add(extension);
     }
-    if (resourceFilterFactory.hasConfigurationFilters()
-        && !resourceFilterFactory.isPrefiltering()) {
+    if (resourceFilterFactory.hasConfigurationFilters()) {
       additionalAaptOpts.add("-c").add(resourceFilterFactory.getConfigurationFilterString());
     }