Add support for the <type>/<package>:<name> method of declaring resources.

RELNOTES: None
PiperOrigin-RevId: 166899690

1 files changed, 10 insertions, 6 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 60cbd1f4c6..3e4d200f63 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
@@ -178,12 +178,16 @@ public class XmlResourceValues {
   static XmlResourceValue parseId(
       XMLEventReader eventReader, StartElement start, Namespaces.Collector namespacesCollector)
       throws XMLStreamException {
-    if (XmlResourceValues.isEndTag(eventReader.peek(), start.getName())) {
-      return IdXmlResourceValue.of();
-    } else {
-      return IdXmlResourceValue.of(
-          readContentsAsString(
-              eventReader, start.getName(), namespacesCollector.collectFrom(start)));
+    try {
+      if (XmlResourceValues.isEndTag(eventReader.peek(), start.getName())) {
+        return IdXmlResourceValue.of();
+      } else {
+        return IdXmlResourceValue.of(
+            readContentsAsString(
+                eventReader, start.getName(), namespacesCollector.collectFrom(start)));
+      }
+    } catch (IllegalArgumentException e) {
+      throw new XMLStreamException(e);
     }
   }