aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java
diff options
context:
space:
mode:
authorGravatar Dmitry Lomov <dslomov@google.com>2016-01-21 21:26:32 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-01-22 15:53:48 +0000
commit6073eb6b98026e75b87bc5ec6da31ce3a40c1824 (patch)
tree0f20255ff85f92ae3512b4ec4f5c8cb499b8bb3b /src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java
parent065a5e043e2f7a14812a29322e90cb39e2bb231b (diff)
Refactor dependency filtering out of Rule class.
-- MOS_MIGRATED_REVID=112717648
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java b/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java
index b6389e2f92..48fff568df 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java
@@ -20,6 +20,7 @@ import com.google.devtools.build.lib.cmdline.TargetParsingException;
import com.google.devtools.build.lib.events.EventHandler;
import com.google.devtools.build.lib.packages.Attribute;
import com.google.devtools.build.lib.packages.BuildType;
+import com.google.devtools.build.lib.packages.DependencyFilter;
import com.google.devtools.build.lib.packages.FileTarget;
import com.google.devtools.build.lib.packages.NoSuchThingException;
import com.google.devtools.build.lib.packages.Package;
@@ -27,7 +28,6 @@ import com.google.devtools.build.lib.packages.RawAttributeMapper;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.RuleClass;
import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.util.BinaryPredicate;
import java.util.Collections;
import java.util.Comparator;
@@ -117,11 +117,11 @@ final class CompileOneDependencyTransformer {
// For each rule, see if it has directCompileTimeInputAttribute,
// and if so check the targets listed in that attribute match the label.
- final BinaryPredicate<Rule, Attribute> directCompileTimeInput =
- new BinaryPredicate<Rule, Attribute>() {
+ DependencyFilter directCompileTimeInput =
+ new DependencyFilter() {
@Override
public boolean apply(Rule rule, Attribute attribute) {
- return Rule.DIRECT_COMPILE_TIME_INPUT.apply(rule, attribute)
+ return DependencyFilter.DIRECT_COMPILE_TIME_INPUT.apply(rule, attribute)
// We don't know which path to follow for configurable attributes, so skip them.
&& !rule.isConfigurableAttribute(attribute.getName());
}