summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2018-01-09 18:14:24 -0600
committerYifan Hong2018-01-11 20:30:28 -0600
commit9e1f9406209eaf280ed3c660dc267c99c51f8e1a (patch)
tree6e9c84a2128904bba773cde77cc18d6e5685f094 /parse_xml.cpp
parente001cd738a5e1d47562328f5ac110d3b716c24c3 (diff)
downloadplatform-system-libvintf-9e1f9406209eaf280ed3c660dc267c99c51f8e1a.tar.gz
platform-system-libvintf-9e1f9406209eaf280ed3c660dc267c99c51f8e1a.tar.xz
platform-system-libvintf-9e1f9406209eaf280ed3c660dc267c99c51f8e1a.zip
Do not add empty <vndk> tag to device compatibility matrix
... to make the output clean. This change is backwards compatible since <vndk> is parsed as an optional tag. From this change on, <vndk> should no longer be used (both in device compatibility matrix and in framework manifest). Test: libvintf_test Bug: 36400653 Change-Id: I3b5e849dc39350ba9b5782568991544572ed31d5
Diffstat (limited to 'parse_xml.cpp')
-rw-r--r--parse_xml.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/parse_xml.cpp b/parse_xml.cpp
index 3df7e19..1723bd0 100644
--- a/parse_xml.cpp
+++ b/parse_xml.cpp
@@ -901,7 +901,9 @@ struct CompatibilityMatrixConverter : public XmlNodeConverter<CompatibilityMatri
901 } 901 }
902 } else if (m.mType == SchemaType::DEVICE) { 902 } else if (m.mType == SchemaType::DEVICE) {
903 if (!(flags & SerializeFlag::NO_VNDK)) { 903 if (!(flags & SerializeFlag::NO_VNDK)) {
904 appendChild(root, vndkConverter(m.device.mVndk, d)); 904 if (!(m.device.mVndk == Vndk{})) {
905 appendChild(root, vndkConverter(m.device.mVndk, d));
906 }
905 } 907 }
906 } 908 }
907 909