Categorize build options for BuildConfiguration.

PiperOrigin-RevId: 171017483
GitOrigin-RevId: e1b09f2f072231ed882c1de364fe3ea5c1f7d5af
Change-Id: I697b9bfbf16dbd4186ec50362795d8a0f937dd73

3 files changed, 29 insertions, 14 deletions

diff --git a/java/com/google/devtools/common/options/OptionDocumentationCategory.java b/java/com/google/devtools/common/options/OptionDocumentationCategory.java
index 1f27046..dd5420c 100644
--- a/java/com/google/devtools/common/options/OptionDocumentationCategory.java
+++ b/java/com/google/devtools/common/options/OptionDocumentationCategory.java
@@ -54,6 +54,12 @@ public enum OptionDocumentationCategory {
   /** This option's primary purpose is to affect the verbosity, format or location of logging. */
   LOGGING,
 
+  /**
+   * This option affects how strictly Bazel enforces valid build inputs (rule definitions,
+   * flag combinations, etc).
+   */
+  INPUT_STRICTNESS,
+
   /** This option deals with how to go about executing the build. */
   EXECUTION_STRATEGY,
 
diff --git a/java/com/google/devtools/common/options/OptionEffectTag.java b/java/com/google/devtools/common/options/OptionEffectTag.java
index 136929a..500643f 100644
--- a/java/com/google/devtools/common/options/OptionEffectTag.java
+++ b/java/com/google/devtools/common/options/OptionEffectTag.java
@@ -139,8 +139,12 @@ public enum OptionEffectTag {
 
   /**
    * This option is used to change command line arguments of one or more actions during the build.
+   *
+   * <p>Even though many options implicitly change command line arguments because they change
+   * configured target analysis, this setting is intended for options specifically meant for
+   * for that purpose.
    */
-  ACTION_OPTIONS(13),
+  ACTION_COMMAND_LINES(13),
 
   /** This option is used to change the testrunner environment of the build. */
   TEST_RUNNER(14);
diff --git a/java/com/google/devtools/common/options/OptionFilterDescriptions.java b/java/com/google/devtools/common/options/OptionFilterDescriptions.java
index 4c6efef..2a7999d 100644
--- a/java/com/google/devtools/common/options/OptionFilterDescriptions.java
+++ b/java/com/google/devtools/common/options/OptionFilterDescriptions.java
@@ -22,18 +22,19 @@ public class OptionFilterDescriptions {
 
   /** The order that the categories should be listed in. */
   static OptionDocumentationCategory[] documentationOrder = {
-    OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
-    OptionDocumentationCategory.EXECUTION_STRATEGY,
-    OptionDocumentationCategory.TOOLCHAIN,
-    OptionDocumentationCategory.OUTPUT_SELECTION,
-    OptionDocumentationCategory.OUTPUT_PARAMETERS,
-    OptionDocumentationCategory.SIGNING,
-    OptionDocumentationCategory.TESTING,
-    OptionDocumentationCategory.QUERY,
-    OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION,
-    OptionDocumentationCategory.LOGGING,
-    OptionDocumentationCategory.GENERIC_INPUTS,
-    OptionDocumentationCategory.UNCATEGORIZED
+      OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
+      OptionDocumentationCategory.EXECUTION_STRATEGY,
+      OptionDocumentationCategory.TOOLCHAIN,
+      OptionDocumentationCategory.OUTPUT_SELECTION,
+      OptionDocumentationCategory.OUTPUT_PARAMETERS,
+      OptionDocumentationCategory.INPUT_STRICTNESS,
+      OptionDocumentationCategory.SIGNING,
+      OptionDocumentationCategory.TESTING,
+      OptionDocumentationCategory.QUERY,
+      OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION,
+      OptionDocumentationCategory.LOGGING,
+      OptionDocumentationCategory.GENERIC_INPUTS,
+      OptionDocumentationCategory.UNCATEGORIZED
   };
 
   static ImmutableMap<OptionDocumentationCategory, String> getOptionCategoriesEnumDescription(
@@ -65,6 +66,10 @@ public class OptionFilterDescriptions {
             "Options that let the user configure the intended output, affecting its value, as "
                 + "opposed to its existence")
         .put(
+            OptionDocumentationCategory.INPUT_STRICTNESS,
+            "Options that affect how strictly Bazel enforces valid build inputs (rule definitions, "
+                + " flag combinations, etc.)")
+        .put(
             OptionDocumentationCategory.SIGNING,
             "Options that affect the signing outputs of a build")
         .put(
@@ -140,7 +145,7 @@ public class OptionFilterDescriptions {
             OptionEffectTag.TERMINAL_OUTPUT,
             "This option affects " + productName + "'s terminal output.")
         .put(
-            OptionEffectTag.ACTION_OPTIONS,
+            OptionEffectTag.ACTION_COMMAND_LINES,
             "This option changes the command line arguments of one or more build actions.")
         .put(
             OptionEffectTag.TEST_RUNNER,