commit aced81101ca1d7dd5faa815f4867109efdd4e243
author corysmith <corysmith@google.com> Fri Sep 07 10:23:45 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Sep 07 10:25:33 2018 -0700
tree 040e6ec324ad88fb6df5253e2a1639b661e8d26a
parent 395fbbdb7f17b97ed140fc0e4a1e061c7bf73843

Add back configuration filtering to aapt

RELNOTES: Fixes aapt shrink resources not respecting filters configurations
PiperOrigin-RevId: 211995436

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

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
index f70c02b..fedab2d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceShrinkerActionBuilder.java
@@ -130,7 +130,9 @@
               .addVectoredFlag(
                   "--resourcePackages", getResourcePackages(primaryResources, dependencyResources))
               .addInput("--primaryManifest", primaryResources.getManifest())
-              .maybeAddInput("--dependencyManifest", getManifests(dependencyResources));
+              .maybeAddInput("--dependencyManifest", getManifests(dependencyResources))
+              .maybeAddFlag(
+                  "--resourceConfigs", resourceFilterFactory.getConfigurationFilterString());
     }
 
     builder

src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 09d6936..9a5f31e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -877,6 +877,7 @@
         "               inline_constants = 0,",
         "               resource_files = ['res/values/strings.xml'],",
         "               shrink_resources = 1,",
+        "               resource_configuration_filters = ['en'],",
         "               proguard_specs = ['proguard-spec.pro'],)");
 
     ConfiguredTarget binary = getConfiguredTarget("//java/com/google/android/hello:hello");
@@ -913,6 +914,9 @@
     assertThat(flagValue("--primaryManifest", shrinkingArgs))
         .isEqualTo(flagValue("--manifestOutput", processingArgs));
 
+    assertThat(flagValue("--resourceConfigs", shrinkingArgs))
+        .isEqualTo(flagValue("--resourceConfigs", processingArgs));
+
     List<String> packageArgs =
         getGeneratingSpawnActionArgs(getFirstArtifactEndingWith(artifacts, "_hello_proguard.cfg"));