diff options
| author |  Greg Estren <gregce@google.com> | 2016-05-10 19:28:56 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-05-11 10:23:01 +0000 |
| commit | fd190888b8174041296289508531377528454b53 (patch) | |
| tree | 5890669fcca607cc936169c46a129c7ff54bc4d4 /src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java | |
| parent | 5cfd8329e25e1f1093619142abeb339741297666 (diff) | |
Remove LABEL_LIST_DICT type. This was only used for abi_deps,
which was removed in c231574.
--
MOS_MIGRATED_REVID=121974686
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java b/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java index 90d4656ca2..9de8ce4914 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java +++ b/src/main/java/com/google/devtools/build/lib/packages/AggregatingAttributeMapper.java @@ -18,7 +18,6 @@ import static com.google.devtools.build.lib.packages.BuildType.FILESET_ENTRY_LIS import static com.google.devtools.build.lib.packages.BuildType.LABEL; import static com.google.devtools.build.lib.packages.BuildType.LABEL_DICT_UNARY; import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST; -import static com.google.devtools.build.lib.packages.BuildType.LABEL_LIST_DICT; import static com.google.devtools.build.lib.packages.BuildType.LICENSE; import static com.google.devtools.build.lib.packages.BuildType.NODEP_LABEL; import static com.google.devtools.build.lib.packages.BuildType.NODEP_LABEL_LIST; @@ -289,8 +288,7 @@ public class AggregatingAttributeMapper extends AbstractAttributeMapper { if (attrType == STRING_DICT || attrType == STRING_DICT_UNARY || attrType == STRING_LIST_DICT - || attrType == LABEL_DICT_UNARY - || attrType == LABEL_LIST_DICT) { + || attrType == LABEL_DICT_UNARY) { Map<Object, Object> mergedDict = new HashMap<>(); for (Object possibleValue : possibleValues) { Map<Object, Object> stringDict = (Map<Object, Object>) possibleValue; |