diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 21 |
1 files changed, 0 insertions, 21 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 79bcc958f6..bcb5cb7a99 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 @@ -798,21 +798,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { public boolean skipParsingAction; @Option( - name = "experimental_android_inherit_resources_in_tests", - defaultValue = "true", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = { - OptionEffectTag.AFFECTS_OUTPUTS, - OptionEffectTag.LOADING_AND_ANALYSIS, - }, - metadataTags = OptionMetadataTag.EXPERIMENTAL, - help = "If true, local_resource_files indicates that resource files should be inherited" - + "from deps in android_test targets. Otherwise, resources will not be inherited from" - + " deps for those targets." - ) - public boolean inheritResourcesInTests; - - @Option( name = "android_fixed_resource_neverlinking", defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, @@ -905,7 +890,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { private final boolean useParallelDex2Oat; private final boolean allowAndroidResources; private final boolean allowResourcesAttr; - private final boolean inheritResourcesInTests; private final boolean skipParsingAction; private final boolean fixedResourceNeverlinking; @@ -945,7 +929,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { this.useParallelDex2Oat = options.useParallelDex2Oat; this.allowAndroidResources = options.allowAndroidResources; this.allowResourcesAttr = options.allowResourcesAttr; - this.inheritResourcesInTests = options.inheritResourcesInTests; this.skipParsingAction = options.skipParsingAction; this.fixedResourceNeverlinking = options.fixedResourceNeverlinking; @@ -1105,10 +1088,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { return this.allowResourcesAttr; } - public boolean inheritResourcesInTests() { - return this.inheritResourcesInTests; - } - public boolean skipParsingAction() { return this.skipParsingAction; } |