summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2017-04-28 16:22:16 -0500
committerYifan Hong2017-04-28 17:27:59 -0500
commit0f85ac3e9e1159371af07e7aeac5450fcc907cff (patch)
tree7a3636a3d3150e67b8248ab9d9590333f48e6727 /parse_xml.cpp
parent242eabff291dcd9f6213e250263aa4da6eead2f7 (diff)
downloadplatform-system-libvintf-0f85ac3e9e1159371af07e7aeac5450fcc907cff.tar.gz
platform-system-libvintf-0f85ac3e9e1159371af07e7aeac5450fcc907cff.tar.xz
platform-system-libvintf-0f85ac3e9e1159371af07e7aeac5450fcc907cff.zip
Allow VNDK to be missing from compatibility matrix.
<vndk> is injected at build time. Test: pass Change-Id: I91146012cd3e9cbd1e15abb33757490479124efa
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 82e96d3..1502011 100644
--- a/parse_xml.cpp
+++ b/parse_xml.cpp
@@ -690,7 +690,9 @@ struct CompatibilityMatrixConverter : public XmlNodeConverter<CompatibilityMatri
690 return false; 690 return false;
691 } 691 }
692 } else if (object->mType == SchemaType::DEVICE) { 692 } else if (object->mType == SchemaType::DEVICE) {
693 if (!parseChild(root, vndkConverter, &object->device.mVndk)) { 693 // <vndk> can be missing because it can be determined at build time, not hard-coded
694 // in the XML file.
695 if (!parseOptionalChild(root, vndkConverter, {}, &object->device.mVndk)) {
694 return false; 696 return false;
695 } 697 }
696 } 698 }