aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
diff options
context:
space:
mode:
authorGravatar gregce <gregce@google.com>2017-12-05 16:10:47 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2017-12-05 16:13:05 -0800
commit21fdc48b07682314a5cee5d4625425f627255c0e (patch)
tree1047cd86755cda74d2288a86d0cd745c41860934 /src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
parentf1db5c995d02e4d23fb490dcd7ab748af31bc5fe (diff)
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/BuildView.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/BuildView.java6
1 files changed, 2 insertions, 4 deletions
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(