aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
diff options
context:
space:
mode:
authorGravatar janakr <janakr@google.com>2018-03-28 11:37:34 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-03-28 11:38:53 -0700
commit9c4fa4a8e987ab4b1c90ab5ce2683bf21b9624fe (patch)
tree761943cd7404526056d1d020e8ec5bcdd951dbe2 /src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
parent460e0cf2260dbe227a89ad53dd39cbcfb22a4016 (diff)
Remove BuildConfiguration from ConfiguredTarget.
PiperOrigin-RevId: 190804641
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java2
1 files changed, 1 insertions, 1 deletions
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;
}