Remove a reference to targetConfiguration from BuildProgressPublisher in preparation for there not being a unique target configuration.

--
MOS_MIGRATED_REVID=124439969

2 files changed, 22 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseCompleteEvent.java
index ab8019ac55..80b0a0b1f8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisPhaseCompleteEvent.java
@@ -23,32 +23,32 @@ import java.util.Collection;
  */
 public class AnalysisPhaseCompleteEvent {
 
-  private final Collection<ConfiguredTarget> targets;
+  private final Collection<ConfiguredTarget> topLevelTargets;
   private final long timeInMs;
   private int targetsVisited;
 
   /**
    * Construct the event.
-   * @param targets The set of active targets that remain.
+   * @param topLevelTargets The set of active topLevelTargets that remain.
    */
-  public AnalysisPhaseCompleteEvent(Collection<? extends ConfiguredTarget> targets,
+  public AnalysisPhaseCompleteEvent(Collection<? extends ConfiguredTarget> topLevelTargets,
       int targetsVisited, long timeInMs) {
     this.timeInMs = timeInMs;
     // Do not remove <ConfiguredTarget>: workaround for Java 7 type inference.
-    this.targets = ImmutableList.<ConfiguredTarget>copyOf(targets);
+    this.topLevelTargets = ImmutableList.<ConfiguredTarget>copyOf(topLevelTargets);
     this.targetsVisited = targetsVisited;
   }
 
   /**
-   * @return The set of active targets remaining, which is a subset
-   *     of the targets we attempted to analyze.
+   * @return The set of active topLevelTargets remaining, which is a subset
+   *     of the topLevelTargets we attempted to analyze.
    */
-  public Collection<ConfiguredTarget> getTargets() {
-    return targets;
+  public Collection<ConfiguredTarget> getTopLevelTargets() {
+    return topLevelTargets;
   }
 
   /**
-   * @return The number of targets freshly visited during analysis
+   * @return The number of topLevelTargets freshly visited during analysis
    */
   public int getTargetsVisited() {
     return targetsVisited;
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageManager.java b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageManager.java
index 6a5500ff0d..ccfc9ba087 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageManager.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageManager.java
@@ -23,7 +23,6 @@ import java.io.PrintStream;
  * related functionality: Recursive package finding, loaded package checking, etc.
  */
 public interface PackageManager extends PackageProvider, CachingPackageLocator {
-
   /**
    * Returns the package cache statistics.
    */
@@ -55,6 +54,19 @@ public interface PackageManager extends PackageProvider, CachingPackageLocator {
    * Collects statistics of the package manager since the last sync.
    */
   interface PackageManagerStatistics {
+    public static final PackageManagerStatistics ZERO = new PackageManagerStatistics() {
+        @Override public int getPackagesLoaded() {
+          return 0;
+        }
+
+        @Override public int getPackagesLookedUp() {
+          return 0;
+        }
+
+        @Override public int getCacheSize() {
+          return 0;
+        }
+    };
 
     /**
      * Returns the number of packages loaded since the last sync. I.e. the cache