diff options
author | 2015-09-25 15:14:27 +0000 | |
---|---|---|
committer | 2015-09-28 11:38:53 +0000 | |
commit | dc7af5392e60b6b98ebaea7ead11d47218a8df03 (patch) | |
tree | 9ede118e9c37880d647a64d4107480d2f1d92c6e /src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java | |
parent | fb39c4efa8e9b7da0329a384ba7d05969c890c20 (diff) |
Split the PackageManager type hierarchy; no longer inherit LoadedPackageProv.
This limits the exposure of LoadedPackageProvider, such that there will be
no regressions in the use of getLoadedTarget. Unfortunately, fully removing
LoadedPackageProvider is more work than I'm willing to take on right now, and
this is the cleanest intermediate solution I could come up with.
This unblocks my other work (removing SkyframeExecutor.errorEventHandler).
Someone else will have to shave this yak.
--
MOS_MIGRATED_REVID=103943375
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java index b341a7b85e..07d776c3bc 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionArtifactCycleReporter.java @@ -20,6 +20,7 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.analysis.LabelAndConfiguration; import com.google.devtools.build.lib.cmdline.Label; +import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider; import com.google.devtools.build.lib.skyframe.ArtifactValue.OwnedArtifact; import com.google.devtools.build.skyframe.CycleInfo; import com.google.devtools.build.skyframe.SkyFunctionName; @@ -35,7 +36,7 @@ public class ActionArtifactCycleReporter extends AbstractLabelCycleReporter { SkyFunctions.isSkyFunction(SkyFunctions.ACTION_EXECUTION), SkyFunctions.isSkyFunction(SkyFunctions.TARGET_COMPLETION)); - ActionArtifactCycleReporter(SkyframePackageManager loadedPackageProvider) { + ActionArtifactCycleReporter(LoadedPackageProvider loadedPackageProvider) { super(loadedPackageProvider); } |