From 53e45318ad8da0a244639a44c1c9a1720d8c4b10 Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 16 Jan 2018 13:07:33 -0800 Subject: Default to filtering resources in analysis RELNOTES: none PiperOrigin-RevId: 182100169 --- .../devtools/build/lib/rules/android/AndroidConfiguration.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/google/devtools') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java index 6e94e00632..08d4a0c611 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java @@ -664,7 +664,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "experimental_android_resource_filtering_method", converter = ResourceFilterFactory.Converter.class, - defaultValue = "filter_in_execution", + defaultValue = "filter_in_analysis", documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION, effectTags = { OptionEffectTag.CHANGES_INPUTS, @@ -675,13 +675,12 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { help = "Determines when resource filtering attributes, such as the android_binary " + "'resource_configuration_filters' and 'densities' attributes, are applied. " - + "By default, bazel will 'filter_in_execution'. The experimental " - + "'filter_in_analysis' option instead applies these filters earlier in the build " - + "process, with corresponding gains in speed. The experimental " + + "By default, bazel will 'filter_in_analysis'. The experimental " + "'filter_in_analysis_with_dynamic_configuration' option also passes these options " + "to the android_binary's dependencies, which also filter their internal resources " + "in analysis, possibly making the build even faster (especially in systems that " - + "do not cache the results of those dependencies)." + + "do not cache the results of those dependencies). When using aapt2, filtering is " + + "only performed in execution, and this setting does nothing." ) // The ResourceFilterFactory object holds the filtering behavior as well as settings for which // resources should be filtered. The filtering behavior is set from the command line, but the -- cgit v1.2.3