From 9c4fa4a8e987ab4b1c90ab5ce2683bf21b9624fe Mon Sep 17 00:00:00 2001 From: janakr Date: Wed, 28 Mar 2018 11:37:34 -0700 Subject: Remove BuildConfiguration from ConfiguredTarget. PiperOrigin-RevId: 190804641 --- .../build/lib/analysis/configuredtargets/MergedConfiguredTarget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java index 40c20c886e..bb1e90851f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java @@ -53,7 +53,7 @@ public final class MergedConfiguredTarget extends AbstractConfiguredTarget { } private MergedConfiguredTarget(ConfiguredTarget base, TransitiveInfoProviderMap providers) { - super(base.getLabel(), base.getConfiguration()); + super(base.getLabel(), base.getConfigurationKey()); this.base = base; this.providers = providers; } -- cgit v1.2.3