aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java
diff options
context:
space:
mode:
authorGravatar Dmitry Lomov <dslomov@google.com>2016-04-06 15:24:36 +0000
committerGravatar Lukacs Berki <lberki@google.com>2016-04-07 11:46:50 +0000
commit777845c31d3b7a2bf246546a6c85b543ccb4ecba (patch)
tree93bd68720bc3480d7df9d6273c32953aca782e7a /src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java
parent2e59ad744028349d8a0d188edf89e233ac3d9bbf (diff)
Remove SkylarkAspectClass.getDefintion.
-- MOS_MIGRATED_REVID=119162307
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java
index ee77e007e8..5500bc8b99 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java
@@ -41,11 +41,9 @@ import java.util.Map;
*/
public class SkylarkAspectFactory implements ConfiguredAspectFactory {
- private final String name;
private final SkylarkAspect skylarkAspect;
- public SkylarkAspectFactory(String name, SkylarkAspect skylarkAspect) {
- this.name = name;
+ public SkylarkAspectFactory(SkylarkAspect skylarkAspect) {
this.skylarkAspect = skylarkAspect;
}
@@ -86,7 +84,8 @@ public class SkylarkAspectFactory implements ConfiguredAspectFactory {
return null;
}
- ConfiguredAspect.Builder builder = new ConfiguredAspect.Builder(name, ruleContext);
+ ConfiguredAspect.Builder builder = new ConfiguredAspect.Builder(
+ skylarkAspect.getName(), ruleContext);
SkylarkClassObject struct = (SkylarkClassObject) aspectSkylarkObject;
Location loc = struct.getCreationLoc();
@@ -126,7 +125,7 @@ public class SkylarkAspectFactory implements ConfiguredAspectFactory {
if (e instanceof EvalExceptionWithStackTrace) {
((EvalExceptionWithStackTrace) e)
.registerPhantomFuncall(
- String.format("%s(...)", name),
+ String.format("%s(...)", skylarkAspect.getName()),
base.getTarget().getAssociatedRule().getLocation(),
skylarkAspect.getImplementation());
}