commit b82a56c01853420fb85cadf99c0b323a67ab858f
author Ulf Adams <ulfjack@google.com> Wed Sep 23 16:56:21 2015 +0000
committer Philipp Wollermann <philwo@google.com> Thu Sep 24 14:18:04 2015 +0000
tree 44207f4c2005c6f3b8a10a11d0a0af327c7d4c24
parent 065e7c1c42adc5d80c4c48527418126d4bf60947

Use a super-interface of PackageProvider where applicable.

Also change some calls to getLoadedTarget to getTarget instead.

--
MOS_MIGRATED_REVID=103755023

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 eb8ec0f..485a845 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
@@ -62,8 +62,8 @@
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.packages.TargetUtils;
+import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider;
 import com.google.devtools.build.lib.pkgcache.LoadingPhaseRunner.LoadingResult;
-import com.google.devtools.build.lib.pkgcache.PackageManager;
 import com.google.devtools.build.lib.rules.test.CoverageReportActionFactory;
 import com.google.devtools.build.lib.rules.test.CoverageReportActionFactory.CoverageReportActionsWrapper;
 import com.google.devtools.build.lib.rules.test.InstrumentedFilesProvider;
@@ -212,7 +212,7 @@
   private final SkyframeBuildView skyframeBuildView;
 
   // Same as skyframeExecutor.getPackageManager().
-  private final PackageManager packageManager;
+  private final LoadedPackageProvider packageManager;
 
   private final BinTools binTools;
 

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

diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
index e3578fa..ae16a16 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
@@ -63,10 +63,10 @@
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.packages.TargetUtils;
+import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider;
 import com.google.devtools.build.lib.pkgcache.LoadingFailedException;
 import com.google.devtools.build.lib.pkgcache.LoadingPhaseRunner.Callback;
 import com.google.devtools.build.lib.pkgcache.LoadingPhaseRunner.LoadingResult;
-import com.google.devtools.build.lib.pkgcache.PackageManager;
 import com.google.devtools.build.lib.profiler.ProfilePhase;
 import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.runtime.BlazeRuntime;
@@ -252,7 +252,7 @@
    *     support the expected environments
    */
   private void checkTargetEnvironmentRestrictions(Iterable<ConfiguredTarget> topLevelTargets,
-      PackageManager packageManager) throws ViewCreationFailedException {
+      LoadedPackageProvider packageManager) throws ViewCreationFailedException {
     for (ConfiguredTarget topLevelTarget : topLevelTargets) {
       BuildConfiguration config = topLevelTarget.getConfiguration();
       if (config == null) {