commit 2aee44b68bbbc29397993062b8757b419f6a5614
author gregce <gregce@google.com> Sat Sep 16 07:16:44 2017 +0200
committer László Csomor <laszlocsomor@google.com> Mon Sep 18 11:29:10 2017 +0200
tree 1c963d23b6f353091ef27a9cf394b0c89346ddea
parent ce1129e940bee67e5312e3168534e7c92cd0e57f

Project reorg: move *ConfiguredTarget to new configuredtargets/ path

Exempt RuleConfiguredTarget in this change because that's liable to touch
a billion files.

PiperOrigin-RevId: 168929827

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 7b3f725..2beb088 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,13 +26,13 @@
 import com.google.devtools.build.lib.analysis.ConfiguredAspectFactory;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.DependencyResolver.InconsistentAspectOrderException;
-import com.google.devtools.build.lib.analysis.MergedConfiguredTarget;
-import com.google.devtools.build.lib.analysis.MergedConfiguredTarget.DuplicateException;
 import com.google.devtools.build.lib.analysis.TargetAndConfiguration;
 import com.google.devtools.build.lib.analysis.ToolchainContext;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
+import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget;
+import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget.DuplicateException;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;