Correctly handle <font> resources in busybox

PiperOrigin-RevId: 605035132 Change-Id: Ifa1aa7e9996075bfa71d3b89c281e64cbd3f6222
bazelbuild · Feb 7, 2024 · 773942f · 773942f
1 parent 9f0f232
commit 773942f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java b/src/tools/android/java/com/google/devtools/build/android/DataResourceXml.java
@@ -308,6 +308,7 @@ private static XmlResourceValue parseXmlElements(
       case STRING:
       case BOOL:
       case COLOR:
+      case FONT:
       case FRACTION:
       case INTEGER:
       case DRAWABLE:

diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/SimpleXmlResourceValue.java b/src/tools/android/java/com/google/devtools/build/android/xml/SimpleXmlResourceValue.java
@@ -62,6 +62,7 @@ public class SimpleXmlResourceValue implements XmlResourceValue {
   static final QName TAG_COLOR = QName.valueOf("color");
   static final QName TAG_DIMEN = QName.valueOf("dimen");
   static final QName TAG_DRAWABLE = QName.valueOf("drawable");
+  static final QName TAG_FONT = QName.valueOf("font");
   static final QName TAG_FRACTION = QName.valueOf("fraction");
   static final QName TAG_INTEGER = QName.valueOf("integer");
   static final QName TAG_ITEM = QName.valueOf("item");
@@ -80,7 +81,7 @@ public enum Type {
     COLOR(TAG_COLOR),
     DIMEN(TAG_DIMEN),
     DRAWABLE(TAG_DRAWABLE),
-    FONT(TAG_ITEM),
+    FONT(TAG_FONT),
     FRACTION(TAG_FRACTION),
     INTEGER(TAG_INTEGER),
     ITEM(TAG_ITEM),