From 01f85c025aaf4b6c0f138f00515227a092dd05c2 Mon Sep 17 00:00:00 2001
From: Dmitry Lomov <dslomov@google.com>
Date: Wed, 29 Jun 2016 06:37:50 +0000
Subject: For --aspects parameter, ignore top-level targets that are not rules.

--
MOS_MIGRATED_REVID=126161513
---
 .../java/com/google/devtools/build/lib/analysis/BuildView.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/analysis/BuildView.java')

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 7b42b376b5..2f5f70f01d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -449,7 +449,10 @@ public class BuildView {
         PathFragment bzlFile = new PathFragment("/" + aspect.substring(0, delimiterPosition));
 
         String skylarkFunctionName = aspect.substring(delimiterPosition + 1);
-        for (ConfiguredTargetKey targetSpec : topLevelCtKeys) {
+        for (TargetAndConfiguration targetSpec : topLevelTargetsWithConfigs) {
+          if (!(targetSpec.getTarget() instanceof Rule)) {
+            continue;
+          }
           aspectKeys.add(
               AspectValue.createSkylarkAspectKey(
                   targetSpec.getLabel(),
@@ -464,7 +467,10 @@ public class BuildView {
         final NativeAspectClass aspectFactoryClass =
             ruleClassProvider.getNativeAspectClassMap().get(aspect);
         if (aspectFactoryClass != null) {
-          for (ConfiguredTargetKey targetSpec : topLevelCtKeys) {
+          for (TargetAndConfiguration targetSpec : topLevelTargetsWithConfigs) {
+            if (!(targetSpec.getTarget() instanceof Rule)) {
+              continue;
+            }
             aspectKeys.add(
                 AspectValue.createAspectKey(
                     targetSpec.getLabel(),
-- 
cgit v1.2.3