commit 777845c31d3b7a2bf246546a6c85b543ccb4ecba
author Dmitry Lomov <dslomov@google.com> Wed Apr 06 15:24:36 2016 +0000
committer Lukacs Berki <lberki@google.com> Thu Apr 07 11:46:50 2016 +0000
tree 93bd68720bc3480d7df9d6273c32953aca782e7a
parent 2e59ad744028349d8a0d188edf89e233ac3d9bbf

Remove SkylarkAspectClass.getDefintion.

--
MOS_MIGRATED_REVID=119162307

src/main/java/com/google/devtools/build/lib/packages/Attribute.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
index bf4a0a7..f865e99 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -86,15 +86,18 @@
   }
 
   private static class SkylarkRuleAspect extends RuleAspect<SkylarkAspectClass> {
-    public SkylarkRuleAspect(SkylarkAspectClass aspectClass) {
+    private final AspectDefinition definition;
+
+    public SkylarkRuleAspect(SkylarkAspectClass aspectClass, AspectDefinition definition) {
       super(aspectClass, NO_PARAMETERS);
+      this.definition = definition;
     }
 
     @Override
     public Aspect getAspect(Rule rule) {
       return Aspect.forSkylark(
           aspectClass,
-          aspectClass.getDefinition(),
+          definition,
           parametersExtractor.apply(rule));
     }
   }
@@ -795,8 +798,8 @@
       return this.aspect(aspect, noParameters);
     }
 
-    public Builder<TYPE> aspect(SkylarkAspectClass aspectClass) {
-      this.aspects.add(new SkylarkRuleAspect(aspectClass));
+    public Builder<TYPE> aspect(SkylarkAspectClass aspectClass, AspectDefinition definition) {
+      this.aspects.add(new SkylarkRuleAspect(aspectClass, definition));
       return this;
     }