Automated g4 rollback of commit 1d9e1ac90197b1d3d7b137ba3c1ada67bb9ba31b.

*** Reason for rollback ***

Breaks //src/test/shell/integration:force_delete_output_test

*** Original change description ***

Symlink output directories to the correct directory name

If the workspace directory is /path/to/my/proj and the name in the WORKSPACE
file is "floop", this will symlink the output directories to
output_base/execroot/floop instead of output_base/execroot/proj.

More prep for #1262, fixes #1681.

PiperOrigin-RevId: 152126545

1 files changed, 8 insertions, 13 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseStartedEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseStartedEvent.java
index 25e95947e0..48b746c655 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseStartedEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseStartedEvent.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.analysis;
 
 import com.google.common.base.Function;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Target;
@@ -27,22 +26,14 @@ import java.util.Collection;
  */
 public class AnalysisPhaseStartedEvent {
 
-  private final ImmutableSet<Target> targets;
+  private final Iterable<Label> labels;
 
   /**
    * Construct the event.
    * @param targets The set of active targets that remain.
    */
   public AnalysisPhaseStartedEvent(Collection<Target> targets) {
-    this.targets = ImmutableSet.copyOf(targets);
-  }
-
-  /**
-   * @return The set of active targets remaining, which is a subset
-   *     of the targets we attempted to load.
-   */
-  public Iterable<Label> getLabels() {
-    return Iterables.transform(targets, new Function<Target, Label>() {
+    this.labels = Iterables.transform(targets, new Function<Target, Label>() {
       @Override
       public Label apply(Target input) {
         return input.getLabel();
@@ -50,7 +41,11 @@ public class AnalysisPhaseStartedEvent {
     });
   }
 
-  public ImmutableSet<Target> getTargets() {
-    return targets;
+  /**
+   * @return The set of active targets remaining, which is a subset
+   *     of the targets we attempted to load.
+   */
+  public Iterable<Label> getLabels() {
+    return labels;
   }
 }