aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/query2/output
diff options
context:
space:
mode:
authorGravatar Michael Staib <mstaib@google.com>2017-02-23 19:06:31 +0000
committerGravatar Irina Iancu <elenairina@google.com>2017-02-24 08:29:51 +0000
commit5e9e1949f4c08ce09665b92aadf7ec7e518aab6a (patch)
tree16afc722aa4e692a311271e932e7806d5e1f8c7d /src/main/java/com/google/devtools/build/lib/query2/output
parent56d66ff8b8616b6ec07c2c604da5d717c0a91aff (diff)
Add the LABEL_KEYED_STRING_DICT type for attributes.
This enables both native and Skylark rules to declare attributes which have labels/Targets as keys, and have string values. -- PiperOrigin-RevId: 148365033 MOS_MIGRATED_REVID=148365033
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/query2/output')
-rw-r--r--src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
index 317888d073..66e1182c74 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
@@ -432,7 +432,8 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
if (attrType == Type.STRING_DICT
|| attrType == Type.STRING_DICT_UNARY
|| attrType == Type.STRING_LIST_DICT
- || attrType == BuildType.LABEL_DICT_UNARY) {
+ || attrType == BuildType.LABEL_DICT_UNARY
+ || attrType == BuildType.LABEL_KEYED_STRING_DICT) {
Map<Object, Object> mergedDict = new HashMap<>();
for (Object possibleValue : possibleValues) {
Map<Object, Object> stringDict = (Map<Object, Object>) possibleValue;