commit dad2dd31dfb1b670d276de025464bc2ef631af53
author jcater <jcater@google.com> Mon Apr 13 08:31:58 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 13 08:33:14 2020 -0700
tree bc2d3f9f71573a7d6e696992ff275292bd3d9fd1
parent d5084589f3a549e520ea5f37af29faafce3c5bcf

Split DependencyKind and InconsistentAspectOrderException into their own classes.

This removes dependency cycles between analysis and skyframe code.

PiperOrigin-RevId: 306237789

src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index 3d2e5ed..3954b69 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -26,10 +26,10 @@
 import com.google.devtools.build.lib.analysis.ConfiguredAspect;
 import com.google.devtools.build.lib.analysis.ConfiguredAspectFactory;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
+import com.google.devtools.build.lib.analysis.DependencyKind;
 import com.google.devtools.build.lib.analysis.DependencyResolver;
-import com.google.devtools.build.lib.analysis.DependencyResolver.DependencyKind;
-import com.google.devtools.build.lib.analysis.DependencyResolver.InconsistentAspectOrderException;
 import com.google.devtools.build.lib.analysis.DuplicateException;
+import com.google.devtools.build.lib.analysis.InconsistentAspectOrderException;
 import com.google.devtools.build.lib.analysis.ResolvedToolchainContext;
 import com.google.devtools.build.lib.analysis.TargetAndConfiguration;
 import com.google.devtools.build.lib.analysis.ToolchainCollection;