commit e495e6b7afff5930e85a149f7809720b72199005
author gregce <gregce@google.com> Tue Apr 30 14:07:06 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 30 14:08:34 2019 -0700
tree f41f7bd819e0e3f28d0dcd3a4d176994156ce3cf
parent ecd2abd967960ddf4d2e240cf476958a5fefe3b8

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

src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java b/src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java
index c87b315..31ad8d2 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/CircularDependencyTest.java
@@ -25,6 +25,7 @@
 import com.google.common.collect.ImmutableList;
 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.transitions.SplitTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.TransitionFactory;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
@@ -276,8 +277,7 @@
                           return (BuildOptions options) -> {
                             String define = data.attributes().get("define", STRING);
                             BuildOptions newOptions = options.clone();
-                            BuildConfiguration.Options optionsFragment =
-                                newOptions.get(BuildConfiguration.Options.class);
+                            CoreOptions optionsFragment = newOptions.get(CoreOptions.class);
                             optionsFragment.commandLineBuildVariables =
                                 optionsFragment.commandLineBuildVariables.stream()
                                     .filter((pair) -> !pair.getKey().equals(define))