diff options
| author |  ajmichael <ajmichael@google.com> | 2017-11-27 14:02:44 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-27 14:04:53 -0800 |
| commit | e5a37f9da3e20c4af9c8a7b5da4a124d3f196fe7 (patch) | |
| tree | 4b3a78bf4cee1a670b0b2cc09229abde72c8aad4 /src/main/java/com/google/devtools/build/lib | |
| parent | e35047e36e21baabb98eae9a0025bbd6127a1f0e (diff) | |
Delete --experimental_use_manifest_from_resource_apk again.
RELNOTES: None
PiperOrigin-RevId: 177068047
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 11 |
1 files changed, 0 insertions, 11 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 3455b43bf4..6364699686 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 @@ -637,17 +637,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { public boolean throwOnResourceConflict; @Option( - name = "experimental_use_manifest_from_resource_apk", - defaultValue = "true", - documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, - effectTags = {OptionEffectTag.UNKNOWN}, - help = - "Android library rule will use the AppManifest from the resource APK" - + " in the AAR file." - ) - public boolean useManifestFromResourceApk; - - @Option( name = "experimental_android_allow_android_resources", defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, |