Move BuildConfiguration.Options to its own top-level class.
Both BuildConfiguration and Options are dense enough as it is.
https://github.com/bazelbuild/bazel/issues/8170
PiperOrigin-RevId: 246017290
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
index baac274..645f89e 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
@@ -38,6 +38,7 @@
import com.google.devtools.build.lib.analysis.ServerDirectories;
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.analysis.config.BuildOptions;
+import com.google.devtools.build.lib.analysis.config.CoreOptions;
import com.google.devtools.build.lib.analysis.config.FragmentOptions;
import com.google.devtools.build.lib.buildeventstream.AnnounceBuildEventTransportsEvent;
import com.google.devtools.build.lib.buildeventstream.ArtifactGroupNamer;
@@ -835,8 +836,7 @@
public void testReportedConfigurations() throws Exception {
// Verify that configuration events are posted, but only once.
BuildOptions defaultBuildOptions =
- BuildOptions.of(
- ImmutableList.<Class<? extends FragmentOptions>>of(BuildConfiguration.Options.class));
+ BuildOptions.of(ImmutableList.<Class<? extends FragmentOptions>>of(CoreOptions.class));
BuildEvent startEvent =
new GenericBuildEvent(
testId("Initial"),