aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
diff options
context:
space:
mode:
authorGravatar Dmitry Lomov <dslomov@google.com>2016-04-06 14:53:43 +0000
committerGravatar Lukacs Berki <lberki@google.com>2016-04-07 11:46:14 +0000
commite804017809ed3990bbb2f5e6b6cffdcf037349f6 (patch)
tree539c968a7b80d74cd4799905d6464b8de55a1691 /src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
parentb5ce0bb100a9527da156fafa9e0813b3dfe00a2b (diff)
Remove AspectClass.getDefinition
Aspect becomes a triple (AspectClass, AspectDefinition, AspectParameters) and loses its equals() method. After this CL, SkylarkAspectClass.getDefintion still exists and is deprecated. -- MOS_MIGRATED_REVID=119159653
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java')
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index a740a1f8a3..c87eb146a8 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -41,7 +41,6 @@ import com.google.devtools.build.lib.analysis.config.InvalidConfigurationExcepti
import com.google.devtools.build.lib.analysis.util.AnalysisMock;
import com.google.devtools.build.lib.analysis.util.BuildViewTestBase;
import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.Aspect;
import com.google.devtools.build.lib.packages.Attribute;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.pkgcache.LoadingFailedException;
@@ -344,12 +343,12 @@ public class BuildViewTest extends BuildViewTestBase {
Dependency.withTransitionAndAspects(
Label.parseAbsolute("//package:inner"),
Attribute.ConfigurationTransition.NONE,
- ImmutableSet.<Aspect>of());
+ ImmutableSet.<AspectDescriptor>of());
fileDependency =
Dependency.withTransitionAndAspects(
Label.parseAbsolute("//package:file"),
Attribute.ConfigurationTransition.NONE,
- ImmutableSet.<Aspect>of());
+ ImmutableSet.<AspectDescriptor>of());
} else {
innerDependency =
Dependency.withConfiguration(