commit 3d67e008825a2ca4a6265ae6cba63c7e332f8e54
author Ulf Adams <ulfjack@google.com> Tue Mar 29 16:23:01 2016 +0000
committer Klaus Aehlig <aehlig@google.com> Wed Mar 30 08:12:34 2016 +0000
tree a23ba7752d286cd620250d42892d756abf71a5a9
parent 63818a24bf8d0afb8a511495261181c9806db56d

Remove calls of CommandEnvironment.getView; remove ide-info from BuildView.

This makes the late initialization of BuildView more obviously safe.

--
MOS_MIGRATED_REVID=118469655

src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index da3bdad..17298c3 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -34,6 +34,7 @@
 import com.google.devtools.build.lib.actions.ActionGraph;
 import com.google.devtools.build.lib.actions.ActionInputFileCache;
 import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.ArtifactFactory;
 import com.google.devtools.build.lib.actions.BlazeExecutor;
 import com.google.devtools.build.lib.actions.BuildFailedException;
 import com.google.devtools.build.lib.actions.ExecException;
@@ -418,7 +419,7 @@
         // Free memory by removing cache entries that aren't going to be needed. Note that in
         // skyframe full, this destroys the action graph as well, so we can only do it after the
         // action graph is no longer needed.
-        env.getView().clearAnalysisCache(analysisResult.getTargetsToBuild());
+        env.getSkyframeBuildView().clearAnalysisCache(analysisResult.getTargetsToBuild());
         actionGraph = null;
       }
 
@@ -682,9 +683,9 @@
     // client.
     fileCache = createBuildSingleFileCache(executor.getExecRoot());
     skyframeExecutor.setActionOutputRoot(actionOutputRoot);
+    ArtifactFactory artifactFactory = env.getSkyframeBuildView().getArtifactFactory();
     return new SkyframeBuilder(skyframeExecutor,
-        new ActionCacheChecker(actionCache, env.getView().getArtifactFactory(), executionFilter,
-            verboseExplanations),
+        new ActionCacheChecker(actionCache, artifactFactory, executionFilter, verboseExplanations),
         keepGoing, actualJobs,
         request.getPackageCacheOptions().checkOutputFiles
             ? modifiedOutputFiles : ModifiedFileSet.NOTHING_MODIFIED,