Always do filtering in execution (even after doing it in analysis)

Filtering only in analysis was neglecting the possibility of resources being in
filesets, the contents of which are not available in analysis. As such, we must
*always* filter in execution, even though it's usually just going to be a
no-op.

Also, add some documentation of same.

RELNOTES: none
PiperOrigin-RevId: 184722564

1 files changed, 4 insertions, 9 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
index ac072dbf4a..408f7314e6 100644
--- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
@@ -87,15 +87,10 @@ public class Aapt2ResourcePackagingAction {
       final Path compiledResources = Files.createDirectories(tmp.resolve("compiled"));
       final Path linkedOut = Files.createDirectories(tmp.resolve("linked"));
 
-      final List<String> densities;
-      if (options.densities.isEmpty()) {
-        // aapt2 always needs to filter on densities, as the resource filtering from analysis is
-        // disregarded.
-        // TODO(b/70335064): Remove this once we never filter in analysis when building for aapt2.
-        densities = options.densitiesForManifest;
-      } else {
-        densities = options.densities;
-      }
+
+      // TODO(b/72995408): Remove the densitiesForManifest option once it is no longer being passed.
+      final List<String> densities =
+          options.densities.isEmpty() ? options.densitiesForManifest : options.densities;
 
       profiler.recordEndOf("setup").startTask("merging");