* Standardize attribute storage in the proto

* Add attributes to PluralXmlResourceValue

--
MOS_MIGRATED_REVID=127147486

1 files changed, 4 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
index c154a196ff..411be94ba3 100644
--- a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
+++ b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
@@ -96,7 +96,8 @@ public class XmlResourceValues {
     return inputFactoryInstance;
   }
 
-  static XmlResourceValue parsePlurals(XMLEventReader eventReader) throws XMLStreamException {
+  static XmlResourceValue parsePlurals(XMLEventReader eventReader, StartElement start)
+      throws XMLStreamException {
     ImmutableMap.Builder<String, String> values = ImmutableMap.builder();
     for (XMLEvent element = nextTag(eventReader);
         !isEndTag(element, TAG_PLURALS);
@@ -112,7 +113,8 @@ public class XmlResourceValues {
             contents == null ? "" : contents);
       }
     }
-    return PluralXmlResourceValue.of(values.build());
+    return PluralXmlResourceValue.createWithAttributesAndValues(
+        ImmutableMap.copyOf(parseTagAttributes(start)), values.build());
   }
 
   static XmlResourceValue parseStyle(XMLEventReader eventReader, StartElement start)