1 files changed, 15 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java
index e2b21eb75e..e067612835 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/MergedConfiguredTarget.java
@@ -85,6 +85,18 @@ public final class MergedConfiguredTarget extends AbstractConfiguredTarget {
     return aspects;
   }
 
+  @Override
+  public Object getValue(String name) {
+    if (ASPECTS_FIELD.equals(name)) {
+      ImmutableList.Builder<String> builder = ImmutableList.builder();
+      for (AspectDescriptor aspect : aspects) {
+        builder.add(aspect.getDescription());
+      }
+      return builder.build();
+    }
+    return super.getValue(name);
+  }
+
   /** Creates an instance based on a configured target and a set of aspects. */
   public static ConfiguredTarget of(ConfiguredTarget base, Iterable<ConfiguredAspect> aspects)
       throws DuplicateException {
@@ -123,7 +135,7 @@ public final class MergedConfiguredTarget extends AbstractConfiguredTarget {
       aspectProviders.add(mergedExtraActionProviders);
     }
 
-    ImmutableList.Builder<AspectDescriptor> aspectRepresentations = ImmutableList.builder();
+    ImmutableList.Builder<AspectDescriptor> aspectDescriptors = ImmutableList.builder();
 
     for (ConfiguredAspect aspect : aspects) {
       for (Map.Entry<Class<? extends TransitiveInfoProvider>, TransitiveInfoProvider> entry :
@@ -140,11 +152,10 @@ public final class MergedConfiguredTarget extends AbstractConfiguredTarget {
         }
 
         aspectProviders.add(entry.getValue());
-        aspectRepresentations.add(aspect.getDescriptor());
       }
-
+      aspectDescriptors.add(aspect.getDescriptor());
     }
-    return new MergedConfiguredTarget(base, aspectRepresentations.build(), aspectProviders.build());
+    return new MergedConfiguredTarget(base, aspectDescriptors.build(), aspectProviders.build());
   }
 
   private static <T extends TransitiveInfoProvider> List<T> getAllProviders(