Move ConfigFeatureFlagConfiguration.Options to a top-level class.

This class is about to get bigger in a major way, so let's put it in its own class.
This also moves the tests to their own test class, since that class is about to get a lot bigger too.

RELNOTES: None.
PiperOrigin-RevId: 190065717

1 files changed, 1 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java
index a7817769ab..1e217bca53 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java
@@ -32,8 +32,7 @@ public final class ConfigRules implements RuleSet {
   public void init(Builder builder) {
     builder.addRuleDefinition(new ConfigRuleClasses.ConfigBaseRule());
     builder.addRuleDefinition(new ConfigRuleClasses.ConfigSettingRule());
-    builder.addConfig(ConfigFeatureFlagConfiguration.Options.class,
-        new ConfigFeatureFlagConfiguration.Loader());
+    builder.addConfig(ConfigFeatureFlagOptions.class, new ConfigFeatureFlagConfiguration.Loader());
 
     builder.addRuleDefinition(new ConfigRuleClasses.ConfigFeatureFlagRule());
     builder.addSkylarkAccessibleTopLevels("config_common", new ConfigSkylarkCommon());