From 78a5fcff8a311c71cfe163a40856f7413e346409 Mon Sep 17 00:00:00 2001 From: ccalvarin Date: Fri, 30 Mar 2018 08:40:44 -0700 Subject: Remove category checking from incompatible changes. String categories are deprecated, replace this special-cased value with a specific OptionMetadata tag, TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES. RELNOTES: None. PiperOrigin-RevId: 191069412 --- .../devtools/build/lib/rules/objc/ObjcCommandLineOptions.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java index 3251d17f76..fed559423e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java @@ -292,10 +292,12 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "incompatible_strict_objc_module_maps", - category = "incompatible changes", defaultValue = "false", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, - metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, + metadataTags = { + OptionMetadataTag.INCOMPATIBLE_CHANGE, + OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES + }, effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, help = "Propagates Objective-C module maps only to direct dependencies in the 'objc' provider, " -- cgit v1.2.3