diff options
author | 2015-09-18 11:40:12 +0000 | |
---|---|---|
committer | 2015-09-21 08:56:51 +0000 | |
commit | ffa73addaf80ab7a9cf9f98e5d4414b152ae6cb6 (patch) | |
tree | f498621bb8634d934815dbaddf90400eda0ce28d /src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java | |
parent | 29ad862a5bd45d2fdbb921f36bbb95816cf47acc (diff) |
Separate build-specific types and types inherent to Skylark.
--
MOS_MIGRATED_REVID=103374106
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java b/src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java index f2d2cb8e61..06af89f541 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/SrcTargetUtil.java @@ -20,13 +20,13 @@ import com.google.common.collect.Sets; import com.google.devtools.build.lib.concurrent.ThreadSafety; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.packages.AttributeMap; +import com.google.devtools.build.lib.packages.BuildType; import com.google.devtools.build.lib.packages.FileTarget; import com.google.devtools.build.lib.packages.NoSuchPackageException; import com.google.devtools.build.lib.packages.NoSuchTargetException; import com.google.devtools.build.lib.packages.RawAttributeMapper; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.Target; -import com.google.devtools.build.lib.packages.Type; import com.google.devtools.build.lib.syntax.Label; import java.util.ArrayList; @@ -123,10 +123,10 @@ public final class SrcTargetUtil { if (rule.isConfigurableAttribute(attrName)) { // We don't know which path to follow for configurable attributes. So skip them. continue; - } else if (rule.isAttrDefined(attrName, Type.LABEL_LIST)) { - srcLabels.addAll(attributeMap.get(attrName, Type.LABEL_LIST)); - } else if (rule.isAttrDefined(attrName, Type.LABEL)) { - Label srcLabel = attributeMap.get(attrName, Type.LABEL); + } else if (rule.isAttrDefined(attrName, BuildType.LABEL_LIST)) { + srcLabels.addAll(attributeMap.get(attrName, BuildType.LABEL_LIST)); + } else if (rule.isAttrDefined(attrName, BuildType.LABEL)) { + Label srcLabel = attributeMap.get(attrName, BuildType.LABEL); if (srcLabel != null) { srcLabels.add(srcLabel); } |