diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/BuildView.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java | 1 |
2 files changed, 1 insertions, 2 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 8ea61af5a1..8891b274a5 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 @@ -639,8 +639,6 @@ public class BuildView { filterTestsByTargets(configuredTargets, Sets.newHashSet(testsToRun))); } - skyframeExecutor.injectTopLevelContext(topLevelOptions); - Set<Artifact> artifactsToBuild = new HashSet<>(); Set<ConfiguredTarget> parallelTests = new HashSet<>(); Set<ConfiguredTarget> exclusiveTests = new HashSet<>(); diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java index 9bc40fb2ca..d728c63db5 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java @@ -199,6 +199,7 @@ public class BuildTool { // Execution phase. if (needsExecutionPhase(request.getBuildOptions())) { + runtime.getSkyframeExecutor().injectTopLevelContext(request.getTopLevelArtifactContext()); executionTool.executeBuild(request.getId(), analysisResult, result, runtime.getSkyframeExecutor(), configurations, mergePackageRoots(loadingResult.getPackageRoots(), |