aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar ajmichael <ajmichael@google.com>2017-10-12 16:31:44 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-10-13 13:51:42 +0200
commitc6e7ef0e37035be75551347f1f1db6de74b820ac (patch)
tree8075a0c1f55f91c375c42979dda6486bb906d213 /src/main
parent5b4b7a3ebb83a8c93d8f68ade7bf1242c8590256 (diff)
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
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java23
1 files changed, 0 insertions, 23 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 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,
@@ -671,15 +657,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",
documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,