From c6e7ef0e37035be75551347f1f1db6de74b820ac Mon Sep 17 00:00:00 2001 From: ajmichael Date: Thu, 12 Oct 2017 16:31:44 +0200 Subject: Remove some no-op flags. The transition period is over, these features have now been rolled out. RELNOTES: --experimental_use_parallel_android_resource_processing and --experimental_android_use_nocompress_extensions_on_apk are removed. These features are fully rolled out. PiperOrigin-RevId: 171957383 --- .../lib/rules/android/AndroidConfiguration.java | 23 ---------------------- 1 file changed, 23 deletions(-) (limited to 'src/main') 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 85e642d02b..9701e8a221 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 @@ -593,20 +593,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { ) public AndroidAaptVersion androidAaptVersion; - // Do not use on the command line. - @Option( - name = "experimental_use_parallel_android_resource_processing", - defaultValue = "true", - deprecationWarning = - "This flag is deprecated and is a no-op. It will be removed in a future release.", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = {OptionEffectTag.UNKNOWN}, - help = - "Process android_library resources with higher parallelism. Generates library " - + "R classes from a merge action, separately from aapt." - ) - public boolean useParallelResourceProcessing; - @Option( name = "apk_signing_method", converter = ApkSigningMethodConverter.class, @@ -670,15 +656,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { ) public boolean includeLibraryResourceJars; - @Option( - name = "experimental_android_use_nocompress_extensions_on_apk", - defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = {OptionEffectTag.NO_OP}, - help = "This flag is deprecated and has no effect. It will be removed in a future release." - ) - public boolean useNocompressExtensionsOnApk; - @Option( name = "experimental_android_library_exports_manifest_default", defaultValue = "false", -- cgit v1.2.3