commit 940ea0770483ac477fa2d0e36dc660acbd168d89
author Dmitry Lomov <dslomov@google.com> Thu Jan 21 22:34:14 2016 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Fri Jan 22 15:54:30 2016 +0000
tree b60a4f5cf1103f7107dfd7945a89c011f8c33a9e
parent cb14c5e7e0a0f623aaf0911295f19caf9dcd6a8e

Properly filter out Aspect attributes when `blaze query` requests --noimplicit_deps and/or --nohost_deps.

RELNOTES: --noimplicit_deps and --nohost_deps work correctly for Aspect attributes.

--
MOS_MIGRATED_REVID=112724917

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java
index 9b0eb68..4035bfa 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java
@@ -30,6 +30,7 @@
 import com.google.devtools.build.lib.packages.AspectDefinition;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.ConfigurationFragmentPolicy;
+import com.google.devtools.build.lib.packages.DependencyFilter;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.packages.NoSuchTargetException;
 import com.google.devtools.build.lib.packages.NoSuchThingException;
@@ -230,7 +231,8 @@
         return ImmutableList.of();
       }
       Target dependedTarget = pkgValue.getPackage().getTarget(toLabel.getName());
-      return AspectDefinition.visitAspectsIfRequired(fromRule, attr, dependedTarget).values();
+      return AspectDefinition.visitAspectsIfRequired(fromRule, attr, dependedTarget,
+          DependencyFilter.ALL_DEPS).values();
     } catch (NoSuchThingException e) {
       // Do nothing. This error was handled when we computed the corresponding
       // TransitiveTargetValue.