commit 24e813a87d7c8e0bd5e443a23072831f4d524923
author Ulf Adams <ulfjack@google.com> Mon Sep 28 14:34:08 2015 +0000
committer Florian Weikert <fwe@google.com> Wed Sep 30 09:29:59 2015 +0000
tree 02d510d4b0d778b5053695d789a996e3404170b0
parent 443db5ccfa8403580b5f5fb5cf17c1f66fb78739

Remove BuildView.packageManager, which was only used for testing.

Now that we have an EventHandler everywhere, we can just use the bridge code
to call into the usual PackageManager.

--
MOS_MIGRATED_REVID=104098660

src/main/java/com/google/devtools/build/lib/analysis/BuildView.java

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 113cd18..14302ac 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
@@ -208,9 +208,6 @@
   private final SkyframeExecutor skyframeExecutor;
   private final SkyframeBuildView skyframeBuildView;
 
-  // Same as skyframeExecutor.getPackageManager().
-  private final LoadedPackageProvider packageManager;
-
   private final ConfiguredRuleClassProvider ruleClassProvider;
 
   /**
@@ -233,7 +230,6 @@
       SkyframeExecutor skyframeExecutor,
       CoverageReportActionFactory coverageReportActionFactory) {
     this.directories = directories;
-    this.packageManager = skyframeExecutor.getLoadedPackageProvider();
     this.coverageReportActionFactory = coverageReportActionFactory;
     this.ruleClassProvider = ruleClassProvider;
     this.skyframeExecutor = Preconditions.checkNotNull(skyframeExecutor);
@@ -777,7 +773,7 @@
 
   @VisibleForTesting
   public Iterable<Dependency> getDirectPrerequisiteDependenciesForTesting(
-      EventHandler eventHandler, ConfiguredTarget ct,
+      final EventHandler eventHandler, ConfiguredTarget ct,
       @Nullable final LoadingCache<Label, Target> targetCache,
       BuildConfigurationCollection configurations) throws InterruptedException {
     if (!(ct.getTarget() instanceof Rule)) {
@@ -798,7 +794,8 @@
       @Override
       protected Target getTarget(Label label) throws NoSuchThingException {
         if (targetCache == null) {
-          return packageManager.getLoadedTarget(label);
+          return LoadedPackageProvider.Bridge.getLoadedTarget(
+              skyframeExecutor.getPackageManager(), eventHandler, label);
         }
 
         try {
@@ -843,7 +840,7 @@
   }
 
   private ListMultimap<Attribute, ConfiguredTarget> getPrerequisiteMapForTesting(
-      EventHandler eventHandler, ConfiguredTarget target,
+      final EventHandler eventHandler, ConfiguredTarget target,
       BuildConfigurationCollection configurations) throws InterruptedException {
     DependencyResolver resolver = new DependencyResolver() {
       @Override
@@ -858,7 +855,8 @@
 
       @Override
       protected Target getTarget(Label label) throws NoSuchThingException {
-        return packageManager.getLoadedTarget(label);
+        return LoadedPackageProvider.Bridge.getLoadedTarget(
+            skyframeExecutor.getPackageManager(), eventHandler, label);
       }
     };
     TargetAndConfiguration ctNode = new TargetAndConfiguration(target);