Move action_outs directory to under the output path.

PiperOrigin-RevId: 152307322

1 files changed, 6 insertions, 6 deletions

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 59e447eecd..997b9e7504 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
@@ -350,6 +350,9 @@ public class ExecutionTool {
       startLocalOutputBuild(analysisResult.getWorkspaceName());
     }
 
+    // Must be created after the output path is created above.
+    createActionLogDirectory();
+
     List<BuildConfiguration> targetConfigurations = configurations.getTargetConfigurations();
     BuildConfiguration targetConfiguration = targetConfigurations.size() == 1
         ? targetConfigurations.get(0) : null;
@@ -496,9 +499,6 @@ public class ExecutionTool {
     // Prepare for build.
     Profiler.instance().markPhase(ProfilePhase.PREPARE);
 
-    // Create some tools symlinks / cleanup per-build state
-    createActionLogDirectory();
-
     // Plant the symlink forest.
     try {
       new SymlinkForest(
@@ -518,12 +518,12 @@ public class ExecutionTool {
   }
 
   private void createActionLogDirectory() throws ExecutorInitException {
-    Path directory = env.getDirectories().getActionConsoleOutputDirectory();
+    Path directory = env.getActionConsoleOutputDirectory();
     try {
       if (directory.exists()) {
         FileSystemUtils.deleteTree(directory);
       }
-      directory.createDirectory();
+      FileSystemUtils.createDirectoryAndParents(directory);
     } catch (IOException e) {
       throw new ExecutorInitException("Couldn't delete action output directory", e);
     }
@@ -655,7 +655,7 @@ public class ExecutionTool {
     BuildRequest.BuildRequestOptions options = request.getBuildOptions();
     boolean keepGoing = request.getViewOptions().keepGoing;
 
-    Path actionOutputRoot = env.getDirectories().getActionConsoleOutputDirectory();
+    Path actionOutputRoot = env.getActionConsoleOutputDirectory();
     Predicate<Action> executionFilter = CheckUpToDateFilter.fromOptions(
         request.getOptions(ExecutionOptions.class));