diff options
| author |  gregce <gregce@google.com> | 2017-09-20 23:43:14 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-09-21 11:04:19 +0200 |
| commit | 4c3ef116e3aba72a0fc643b670e2cd872e85028d (patch) | |
| tree | c6784a4af17cc74927fd10e29dc0d0cdd825754e /src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | |
| parent | bcb3c5798390d6901681e74e19099378a9afae0a (diff) | |
Move aspect resolution out of ConfiguredTargetFunction.
Part of the effort to simplify ConfiguredTargetFunction.
PiperOrigin-RevId: 169453435
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 2beb088b59..f67a4e883e 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 @@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.actions.ActionAnalysisMetadata; import com.google.devtools.build.lib.actions.ActionLookupValue; import com.google.devtools.build.lib.analysis.AliasProvider; +import com.google.devtools.build.lib.analysis.AspectResolver; import com.google.devtools.build.lib.analysis.CachingAnalysisEnvironment; import com.google.devtools.build.lib.analysis.ConfiguredAspect; import com.google.devtools.build.lib.analysis.ConfiguredAspectFactory; @@ -466,7 +467,7 @@ public final class AspectFunction implements SkyFunction { } ConfiguredAspect configuredAspect; - if (ConfiguredTargetFunction.aspectMatchesConfiguredTarget(associatedTarget, aspect)) { + if (AspectResolver.aspectMatchesConfiguredTarget(associatedTarget, aspect)) { configuredAspect = view.getConfiguredTargetFactory() .createAspect( |