From 21fdc48b07682314a5cee5d4625425f627255c0e Mon Sep 17 00:00:00 2001
From: gregce <gregce@google.com>
Date: Tue, 5 Dec 2017 16:10:47 -0800
Subject: Upgrade --target_environment, --auto_cpu_environment_group.

1: Allow both in the same build (before, just one would trigger)
2: Don't check environment defaults from other groups, since neither
   flag asserts any expectations on those groups
PiperOrigin-RevId: 178026699
---
 src/main/java/com/google/devtools/build/lib/analysis/BuildView.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/analysis/BuildView.java')

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index dca8074698..008d137fbc 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -613,10 +613,8 @@ public class BuildView {
     }
 
     Set<ConfiguredTarget> targetsToSkip =
-        TopLevelConstraintSemantics.checkTargetEnvironmentRestrictions(
-            skyframeAnalysisResult.getConfiguredTargets(),
-            skyframeExecutor.getPackageManager(),
-            eventHandler);
+        new TopLevelConstraintSemantics(skyframeExecutor.getPackageManager(), eventHandler)
+            .checkTargetEnvironmentRestrictions(skyframeAnalysisResult.getConfiguredTargets());
 
     AnalysisResult result =
         createResult(
-- 
cgit v1.2.3