Remove categories from Bazel options.

These have all had a chance to be categorized with the OptionDocumentationCategory enum, and the help output already uses the enum-grouped format.

The "incompatible changes" category has meaning for --all_incompatible_changes and will be removed separately.

RELNOTES: None.
PiperOrigin-RevId: 190773778

1 files changed, 0 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxOptions.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxOptions.java
index faaaaa3f90..6a5b79f0fc 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxOptions.java
@@ -77,7 +77,6 @@ public class SandboxOptions extends OptionsBase {
   @Option(
     name = "ignore_unsupported_sandboxing",
     defaultValue = "false",
-    category = "strategy",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     help = "Do not print a warning when sandboxed execution is not supported on this system."
@@ -87,7 +86,6 @@ public class SandboxOptions extends OptionsBase {
   @Option(
     name = "sandbox_debug",
     defaultValue = "false",
-    category = "strategy",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     help =
@@ -99,7 +97,6 @@ public class SandboxOptions extends OptionsBase {
   @Option(
     name = "experimental_sandbox_base",
     defaultValue = "",
-    category = "strategy",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     help =
@@ -113,7 +110,6 @@ public class SandboxOptions extends OptionsBase {
   @Option(
     name = "sandbox_fake_hostname",
     defaultValue = "false",
-    category = "strategy",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     help = "Change the current hostname to 'localhost' for sandboxed actions."
@@ -123,7 +119,6 @@ public class SandboxOptions extends OptionsBase {
   @Option(
     name = "sandbox_fake_username",
     defaultValue = "false",
-    category = "strategy",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     help = "Change the current username to 'nobody' for sandboxed actions."
@@ -134,7 +129,6 @@ public class SandboxOptions extends OptionsBase {
     name = "sandbox_block_path",
     allowMultiple = true,
     defaultValue = "",
-    category = "config",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     help = "For sandboxed actions, disallow access to this path."
@@ -145,7 +139,6 @@ public class SandboxOptions extends OptionsBase {
     name = "sandbox_tmpfs_path",
     allowMultiple = true,
     defaultValue = "",
-    category = "config",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     help =
@@ -158,7 +151,6 @@ public class SandboxOptions extends OptionsBase {
     name = "sandbox_writable_path",
     allowMultiple = true,
     defaultValue = "",
-    category = "config",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     help =
@@ -172,7 +164,6 @@ public class SandboxOptions extends OptionsBase {
     allowMultiple = true,
     converter = MountPairConverter.class,
     defaultValue = "",
-    category = "config",
     documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
     effectTags = {OptionEffectTag.UNKNOWN},
     help = "Add additional path pair to mount in sandbox."
@@ -182,7 +173,6 @@ public class SandboxOptions extends OptionsBase {
   @Option(
     name = "experimental_use_sandboxfs",
     defaultValue = "false",
-    category = "config",
     documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY,
     effectTags = {OptionEffectTag.UNKNOWN},
     help =
@@ -194,7 +184,6 @@ public class SandboxOptions extends OptionsBase {
   @Option(
     name = "experimental_sandboxfs_path",
     defaultValue = "sandboxfs",
-    category = "config",
     documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY,
     effectTags = {OptionEffectTag.UNKNOWN},
     help =