Add a DefaultBuildOptions specifying default build flags that may differ from the provided defaults in Options classes. These are used to create BuildOptionsDiffForReconstruction, which lets us store only the diffs in our BuildConfigurationValue.Keys.

PiperOrigin-RevId: 190117455

1 files changed, 9 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java
index 4069c9aea1..c4566b6a0e 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/DependencyResolverTest.java
@@ -24,6 +24,7 @@ import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider;
 import com.google.devtools.build.lib.analysis.config.FragmentClassSet;
 import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
 import com.google.devtools.build.lib.analysis.util.TestAspects;
+import com.google.devtools.build.lib.bazel.rules.DefaultBuildOptionsForDiffing;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.packages.Aspect;
@@ -60,7 +61,8 @@ public class DependencyResolverTest extends AnalysisTestCase {
 
   @Before
   public final void createResolver() throws Exception {
-    dependencyResolver = new DependencyResolver() {
+    dependencyResolver =
+        new DependencyResolver() {
           @Override
           protected void invalidVisibilityReferenceHook(TargetAndConfiguration node, Label label) {
             throw new IllegalStateException();
@@ -90,7 +92,9 @@ public class DependencyResolverTest extends AnalysisTestCase {
           @Nullable
           @Override
           protected List<BuildConfiguration> getConfigurations(
-              FragmentClassSet fragments, Iterable<BuildOptions> buildOptions) {
+              FragmentClassSet fragments,
+              Iterable<BuildOptions> buildOptions,
+              BuildOptions defaultBuildOptions) {
             throw new UnsupportedOperationException(
                 "this functionality is covered by analysis-phase integration tests");
           }
@@ -109,7 +113,9 @@ public class DependencyResolverTest extends AnalysisTestCase {
         getHostConfiguration(),
         aspect != null ? Aspect.forNative(aspect) : null,
         ImmutableMap.<Label, ConfigMatchingProvider>of(),
-        /*toolchainLabels=*/ ImmutableSet.of());
+        /*toolchainLabels=*/ ImmutableSet.of(),
+        DefaultBuildOptionsForDiffing.getDefaultBuildOptionsForFragments(
+            ruleClassProvider.getConfigurationOptions()));
   }
 
   @SafeVarargs