diff options
author | Marian Lobur <loburm@google.com> | 2015-09-02 12:22:46 +0000 |
---|---|---|
committer | Florian Weikert <fwe@google.com> | 2015-09-02 13:35:56 +0000 |
commit | 4202000465878e5252744f7c32cf39fe41393b9c (patch) | |
tree | 05b1180664ca84cae7ebd8deff8e5f50e6d87ec8 /src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java | |
parent | 702cad7ffc9bc67737fe1a281dbebbeef41b6551 (diff) |
Fix broken tests.
--
MOS_MIGRATED_REVID=102134151
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java index d14bf46aa0..315d9651e1 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PostConfiguredTargetFunction.java @@ -26,6 +26,7 @@ import com.google.devtools.build.lib.analysis.LabelAndConfiguration; import com.google.devtools.build.lib.analysis.TargetAndConfiguration; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.ConfigMatchingProvider; +import com.google.devtools.build.lib.packages.AspectParameters; import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.RawAttributeMapper; import com.google.devtools.build.lib.packages.Rule; @@ -101,7 +102,7 @@ public class PostConfiguredTargetFunction implements SkyFunction { BuildConfiguration hostConfiguration = buildViewProvider.getSkyframeBuildView().getHostConfiguration(ct.getConfiguration()); deps = resolver.dependentNodeMap(ctgValue, hostConfiguration, /*aspect=*/null, - /*aspectParameters=*/null, configConditions); + AspectParameters.EMPTY, configConditions); if (ct.getConfiguration() != null && ct.getConfiguration().useDynamicConfigurations()) { deps = ConfiguredTargetFunction.trimConfigurations(env, ctgValue, deps, hostConfiguration, ruleClassProvider); |