commit 44d1571470ff0a145cf13f3728de5d1483143fb7
author dslomov <dslomov@google.com> Wed Dec 20 05:42:28 2017 -0800
committer Copybara-Service <copybara-piper@google.com> Wed Dec 20 07:14:03 2017 -0800
tree e02dd66f6a8833b0ea0b41a2e50661354538ff5c
parent 41db318dda74cfe97cccda230119481cbb81fc49

Aspects-on-aspect see and propagate over aspect attributes.

If an aspect is applied to a rule+aspect node, all attributes are merged
into ctx.rule.attr collection, and the first one with the same name wins
(in particular, rule attribute will always win over aspect attribute).
This is backwards-compatible, and unlikely to cause problems in
practice.

RELNOTES: Aspects-on-aspect see and propagate over aspect attributes.
PiperOrigin-RevId: 179675660

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 b84126d..8261c7c 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
@@ -1121,7 +1121,7 @@
     return new RuleContext.Builder(
             env,
             (Rule) target.getTarget(),
-            ImmutableList.<AspectDescriptor>of(),
+            ImmutableList.of(),
             targetConfig,
             configurations.getHostConfiguration(),
             ruleClassProvider.getPrerequisiteValidator(),