commit dce017056b397838c4dc1267bebe32d9bb9c9936
author Dmitry Lomov <dslomov@google.com> Mon Nov 28 15:51:32 2016 +0000
committer Irina Iancu <elenairina@google.com> Tue Nov 29 08:06:22 2016 +0000
tree 1a2c7223fe9ca50abea20f4c2021b36871050c42
parent b4073335512d3f36b88d07ec0f804aa819a767d3

Provide AspectDescriptor to ConfiguredAspect.

Also clean up the setting of aspect name in ConfiguredAspect and
AspectDefintion - it is now obtained from the AspectClass.

--
MOS_MIGRATED_REVID=140357052

src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index af00a7e..37abaaf 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -321,7 +321,7 @@
       implements ConfiguredAspectFactory {
       @Override
       public AspectDefinition getDefinition(AspectParameters params) {
-        return new AspectDefinition.Builder("testaspect")
+        return new AspectDefinition.Builder(this)
             .add(attr(":late", LABEL).value(EMPTY_LATE_BOUND_LABEL)).build();
       }
 
@@ -330,7 +330,7 @@
           ConfiguredTarget base, RuleContext ruleContext, AspectParameters parameters)
           throws InterruptedException {
         Object lateBoundPrereq = ruleContext.getPrerequisite(":late", TARGET);
-        return new ConfiguredAspect.Builder("testaspect", ruleContext)
+        return new ConfiguredAspect.Builder(this, parameters, ruleContext)
             .addProvider(
                 AspectInfo.class,
                 new AspectInfo(
@@ -385,15 +385,17 @@
       implements ConfiguredAspectFactory {
       @Override
       public AspectDefinition getDefinition(AspectParameters params) {
-        return new AspectDefinition.Builder("testaspect").build();
+        return new AspectDefinition.Builder(this).build();
       }
 
+
+
       @Override
       public ConfiguredAspect create(
           ConfiguredTarget base, RuleContext ruleContext, AspectParameters parameters)
               throws InterruptedException {
         ruleContext.registerAction(new NullAction(ruleContext.createOutputArtifact()));
-        return new ConfiguredAspect.Builder("testaspect", ruleContext).build();
+        return new ConfiguredAspect.Builder(this, parameters, ruleContext).build();
       }
     }
     private static final AspectThatRegistersAction ASPECT_THAT_REGISTERS_ACTION =