diff options
| author |  kmb <kmb@google.com> | 2017-09-19 00:12:38 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-09-19 09:32:49 +0200 |
| commit | c32ed321429bf0593187c45f144aa034bffe6d2f (patch) | |
| tree | 0e0791383b691316c4a324041311beddbf4767f3 /src/main/java/com | |
| parent | 9055ff26ebccd457ae5d2492e4fa8d4ab2f67664 (diff) | |
Remove flags with no effect from --dexopts_supported_in_dexmerger default in preparation for removing those flags from the tool.
RELNOTES: none
PiperOrigin-RevId: 169154032
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 3 |
1 files changed, 1 insertions, 2 deletions
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 efebcb0a35..49d9e0954f 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 @@ -511,11 +511,10 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { // Do not use on the command line. // This flag is intended to be updated as we add supported flags to the incremental dexing tools - // TODO(b/31711689): remove --no-optimize and --no-locals as DexFileMerger no longer needs them @Option( name = "dexopts_supported_in_dexmerger", converter = Converters.CommaSeparatedOptionListConverter.class, - defaultValue = "--no-optimize,--no-locals,--minimal-main-dex,--set-max-idx-number", + defaultValue = "--minimal-main-dex,--set-max-idx-number", metadataTags = {OptionMetadataTag.HIDDEN}, documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, |