commit 83221e3be280c4f9ddc88d6e8e5e3824dd5a5db8
author jcater <jcater@google.com> Thu May 28 11:37:39 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu May 28 11:38:58 2020 -0700
tree 0e9e767939c0076e2748c3c14baf1e632bb525b4
parent 6f711af917a5fe075f9cba54580b969ff1c6dcdf

Update users of ConfiguredTargetKey to use the Builder.

PiperOrigin-RevId: 313627884

src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java
index 5aaf08e..aab0a37 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java
@@ -49,7 +49,7 @@
       AspectDescriptor aspectDescriptor,
       @Nullable BuildConfiguration aspectConfiguration) {
     return AspectKey.createAspectKey(
-        ConfiguredTargetKey.of(label, baseConfiguration),
+        ConfiguredTargetKey.builder().setLabel(label).setConfiguration(baseConfiguration).build(),
         baseKeys,
         aspectDescriptor,
         aspectConfiguration == null ? null : BuildConfigurationValue.key(aspectConfiguration));
@@ -61,7 +61,7 @@
       AspectDescriptor aspectDescriptor,
       @Nullable BuildConfiguration aspectConfiguration) {
     return AspectKey.createAspectKey(
-        ConfiguredTargetKey.of(label, baseConfiguration),
+        ConfiguredTargetKey.builder().setLabel(label).setConfiguration(baseConfiguration).build(),
         ImmutableList.of(),
         aspectDescriptor,
         aspectConfiguration == null ? null : BuildConfigurationValue.key(aspectConfiguration));
@@ -77,7 +77,10 @@
         new StarlarkAspectLoadingKey(
             targetLabel,
             aspectConfiguration == null ? null : BuildConfigurationValue.key(aspectConfiguration),
-            ConfiguredTargetKey.of(targetLabel, targetConfiguration),
+            ConfiguredTargetKey.builder()
+                .setLabel(targetLabel)
+                .setConfiguration(targetConfiguration)
+                .build(),
             starlarkFileLabel,
             starlarkExportName);