Remove incompatible_disable_objc_provider_resources from Bazel

This flag no longer has any effect. See #5710 for details. RELNOTES: None. PiperOrigin-RevId: 263427228
bazelbuild · Aug 14, 2019 · 6e2ebe5 · 6e2ebe5
1 parent e914fd0
commit 6e2ebe5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 24 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -250,18 +250,6 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
               + "attribute definition methods, such as attr.label().")
   public boolean incompatibleDisableDeprecatedAttrParams;
 
-  @Option(
-      name = "incompatible_disable_objc_provider_resources",
-      defaultValue = "true",
-      documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
-      effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
-      metadataTags = {
-        OptionMetadataTag.INCOMPATIBLE_CHANGE,
-        OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
-      },
-      help = "Unused. Will be removed in future versions of Bazel.")
-  public boolean incompatibleDisableObjcProviderResources;
-
   @Option(
       name = "incompatible_disable_partition_default_parameter",
       defaultValue = "false",
@@ -708,7 +696,6 @@ public StarlarkSemantics toSkylarkSemantics() {
             .incompatibleDisableThirdPartyLicenseChecking(
                 incompatibleDisableThirdPartyLicenseChecking)
             .incompatibleDisableDeprecatedAttrParams(incompatibleDisableDeprecatedAttrParams)
-            .incompatibleDisableObjcProviderResources(incompatibleDisableObjcProviderResources)
             .incompatibleDisallowDictPlus(incompatibleDisallowDictPlus)
             .incompatibleDisallowEmptyGlob(incompatibleDisallowEmptyGlob)
             .incompatibleDisallowLegacyJavaInfo(incompatibleDisallowLegacyJavaInfo)

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -52,8 +52,6 @@ public enum FlagIdentifier {
         StarlarkSemantics::experimentalStarlarkConfigTransitions),
     EXPERIMENTAL_STARLARK_UNUSED_INPUTS_LIST(
         StarlarkSemantics::experimentalStarlarkUnusedInputsList),
-    INCOMPATIBLE_DISABLE_OBJC_PROVIDER_RESOURCES(
-        StarlarkSemantics::incompatibleDisableObjcProviderResources),
     INCOMPATIBLE_NO_OUTPUT_ATTR_DEFAULT(StarlarkSemantics::incompatibleNoOutputAttrDefault),
     INCOMPATIBLE_NO_RULE_OUTPUTS_PARAM(StarlarkSemantics::incompatibleNoRuleOutputsParam),
     INCOMPATIBLE_NO_TARGET_OUTPUT_GROUP(StarlarkSemantics::incompatibleNoTargetOutputGroup),
@@ -152,8 +150,6 @@ public boolean flagValue(FlagIdentifier flagIdentifier) {
 
   public abstract boolean incompatibleDisableDeprecatedAttrParams();
 
-  public abstract boolean incompatibleDisableObjcProviderResources();
-
   public abstract boolean incompatibleDisallowDictPlus();
 
   public abstract boolean incompatibleDisallowEmptyGlob();
@@ -265,7 +261,6 @@ public static Builder builderWithDefaults() {
           .incompatibleDisableTargetProviderFields(false)
           .incompatibleDisableThirdPartyLicenseChecking(true)
           .incompatibleDisableDeprecatedAttrParams(true)
-          .incompatibleDisableObjcProviderResources(true)
           .incompatibleDisallowDictPlus(true)
           .incompatibleDisallowEmptyGlob(false)
           .incompatibleDisallowLegacyJavaProvider(false)
@@ -335,8 +330,6 @@ public abstract static class Builder {
 
     public abstract Builder incompatibleDisableDeprecatedAttrParams(boolean value);
 
-    public abstract Builder incompatibleDisableObjcProviderResources(boolean value);
-
     public abstract Builder incompatibleDisallowDictPlus(boolean value);
 
     public abstract Builder incompatibleDisallowEmptyGlob(boolean value);

diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
@@ -136,7 +136,6 @@ private static StarlarkSemanticsOptions buildRandomOptions(Random rand) throws E
         "--incompatible_depset_union=" + rand.nextBoolean(),
         "--incompatible_disable_target_provider_fields=" + rand.nextBoolean(),
         "--incompatible_disable_deprecated_attr_params=" + rand.nextBoolean(),
-        "--incompatible_disable_objc_provider_resources=" + rand.nextBoolean(),
         "--incompatible_disable_third_party_license_checking=" + rand.nextBoolean(),
         "--incompatible_disallow_dict_plus=" + rand.nextBoolean(),
         "--incompatible_disallow_empty_glob=" + rand.nextBoolean(),
@@ -193,7 +192,6 @@ private static StarlarkSemantics buildRandomSemantics(Random rand) {
         .incompatibleDepsetUnion(rand.nextBoolean())
         .incompatibleDisableTargetProviderFields(rand.nextBoolean())
         .incompatibleDisableDeprecatedAttrParams(rand.nextBoolean())
-        .incompatibleDisableObjcProviderResources(rand.nextBoolean())
         .incompatibleDisableThirdPartyLicenseChecking(rand.nextBoolean())
         .incompatibleDisallowDictPlus(rand.nextBoolean())
         .incompatibleDisallowEmptyGlob(rand.nextBoolean())

diff --git a/...e/devtools/build/lib/skylarkinterface/processor/testsources/EnablingAndDisablingFlag.java b/...e/devtools/build/lib/skylarkinterface/processor/testsources/EnablingAndDisablingFlag.java
@@ -30,8 +30,8 @@ public class EnablingAndDisablingFlag {
         @Param(name = "one", type = String.class, named = true),
         @Param(name = "two", type = Integer.class, named = true),
       },
-      enableOnlyWithFlag = FlagIdentifier.INCOMPATIBLE_DISABLE_OBJC_PROVIDER_RESOURCES,
-      disableWithFlag = FlagIdentifier.INCOMPATIBLE_DISABLE_OBJC_PROVIDER_RESOURCES)
+      enableOnlyWithFlag = FlagIdentifier.INCOMPATIBLE_NO_OUTPUT_ATTR_DEFAULT,
+      disableWithFlag = FlagIdentifier.INCOMPATIBLE_NO_OUTPUT_ATTR_DEFAULT)
   public String someMethod(String one, Integer two) {
     return "foo";
   }