commit 0f85ac3e9e1159371af07e7aeac5450fcc907cff
author Yifan Hong <elsk@google.com> Fri Apr 28 14:22:16 2017 -0700
committer Yifan Hong <elsk@google.com> Fri Apr 28 15:27:59 2017 -0700
tree 7a3636a3d3150e67b8248ab9d9590333f48e6727
parent 242eabff291dcd9f6213e250263aa4da6eead2f7

Allow VNDK to be missing from compatibility matrix.

<vndk> is injected at build time.

Test: pass
Change-Id: I91146012cd3e9cbd1e15abb33757490479124efa

parse_xml.cpp

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 @@
                 return false;
             }
         } else if (object->mType == SchemaType::DEVICE) {
-            if (!parseChild(root, vndkConverter, &object->device.mVndk)) {
+            // <vndk> can be missing because it can be determined at build time, not hard-coded
+            // in the XML file.
+            if (!parseOptionalChild(root, vndkConverter, {}, &object->device.mVndk)) {
                 return false;
             }
         }