Remove unused density filtering flag

Because of limitations in Bazel (primarily, Filesets), we always need to filter
on density in execution. As such, remove the deprecated flag that was used to
specify densities that were stamped but not filtered.

RELNOTES: none
PiperOrigin-RevId: 186634496

1 files changed, 5 insertions, 14 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 83b628cd9e..1d72254640 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
@@ -86,16 +86,6 @@ 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;
-      }
-
       profiler.recordEndOf("setup").startTask("merging");
 
       AndroidDataDeserializer dataDeserializer =
@@ -120,8 +110,9 @@ public class Aapt2ResourcePackagingAction {
                   options.throwOnResourceConflict,
                   executorService)
               .filter(
-                  new DensitySpecificResourceFilter(densities, filteredResources, mergedResources),
-                  new DensitySpecificManifestProcessor(densities, densityManifest));
+                  new DensitySpecificResourceFilter(
+                      options.densities, filteredResources, mergedResources),
+                  new DensitySpecificManifestProcessor(options.densities, densityManifest));
 
       profiler.recordEndOf("merging");
 
@@ -151,7 +142,7 @@ public class Aapt2ResourcePackagingAction {
                                 processedManifest))
                 .processManifest(
                     manifest ->
-                        new DensitySpecificManifestProcessor(densities, densityManifest)
+                        new DensitySpecificManifestProcessor(options.densities, densityManifest)
                             .process(manifest));
         profiler.recordEndOf("compile").startTask("link");
         // Write manifestOutput now before the dummy manifest is created.
@@ -182,7 +173,7 @@ public class Aapt2ResourcePackagingAction {
                 .withAssets(assetDirs)
                 .buildVersion(aaptConfigOptions.buildToolsVersion)
                 .conditionalKeepRules(aaptConfigOptions.conditionalKeepRules == TriState.YES)
-                .filterToDensity(densities)
+                .filterToDensity(options.densities)
                 .includeOnlyConfigs(aaptConfigOptions.resourceConfigs)
                 .link(compiled)
                 .copyPackageTo(options.packagePath)