From e5a37f9da3e20c4af9c8a7b5da4a124d3f196fe7 Mon Sep 17 00:00:00 2001 From: ajmichael Date: Mon, 27 Nov 2017 14:02:44 -0800 Subject: Delete --experimental_use_manifest_from_resource_apk again. RELNOTES: None PiperOrigin-RevId: 177068047 --- .../build/lib/rules/android/AndroidConfiguration.java | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib') 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 @@ -636,17 +636,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", -- cgit v1.2.3