diff options
author | asteinb <asteinb@google.com> | 2018-02-22 10:12:26 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-22 10:14:36 -0800 |
commit | fe13ee3df1181c9054f338f712e3b60ef68b65e3 (patch) | |
tree | c2921eb90511be5e071a3593164359b2fe134e9a /src | |
parent | 586ef002d25f177076f6990d4ca8360993704357 (diff) |
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
Diffstat (limited to 'src')
2 files changed, 7 insertions, 37 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) diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java index 27c9aa2237..40d65996f0 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java @@ -257,22 +257,6 @@ public class AndroidResourceProcessingAction { public List<String> densities; @Option( - name = "densitiesForManifest", - defaultValue = "", - converter = CommaSeparatedOptionListConverter.class, - category = "config", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, - deprecationWarning = "use '--densities' instead.", - effectTags = {OptionEffectTag.UNKNOWN}, - help = - "Densities to specify in the manifest. If 'densities' is specified, that value will be" - + " used instead and this flag will be ignored. However, if resources were filtered" - + " in analysis, this flag can be used to specify densities in the manifest without" - + " repeating the filtering process." - ) - public List<String> densitiesForManifest; - - @Option( name = "packageForR", defaultValue = "null", category = "config", @@ -412,18 +396,13 @@ public class AndroidResourceProcessingAction { logger.fine(String.format("Merging finished at %sms", timer.elapsed(TimeUnit.MILLISECONDS))); - - // 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; - final DensityFilteredAndroidData filteredData = mergedData.filter( // Even if filtering was done in analysis, we still need to filter by density again // in execution since Fileset contents are not available in analysis. new DensitySpecificResourceFilter( - densities, filteredResources, mergedResources), - new DensitySpecificManifestProcessor(densities, densityManifest)); + options.densities, filteredResources, mergedResources), + new DensitySpecificManifestProcessor(options.densities, densityManifest)); logger.fine( String.format( |