commit 3821db8725b9ea3267cddfd0bbad55f50e96527e
author fweikert <fwe@google.com> Fri Jul 16 13:10:25 2021 +0200
committer fweikert <fwe@google.com> Fri Jul 16 13:10:25 2021 +0200
tree b86b301b668f7491188bf8055ab04e82c0353b56
parent 706483fd6398f00fd4faba73812de9bf15728086

Fix merge conflict properly

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index fdd7043..7b4007d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
@@ -750,8 +750,6 @@
         // the event handler.
         if (!keepGoing && noKeepGoingException == null) {
           AspectValueKey aspectKey = (AspectValueKey) errorKey.argument();
-          failedAspectLabel = aspectKey.getBaseConfiguredTargetKey();
-
           String errorMsg =
               String.format(
                   "Analysis of aspect '%s' failed; build aborted", aspectKey.getDescription());