Snap for 4545621 from b7008f8d49920594ce28dbeb36057394816d1c59 to pi-release

Change-Id: Ifd6e5d95557869080270084b84045bf13dd5c2d8

1 files changed, 51 insertions, 2 deletions

diff --git a/parse_xml.cpp b/parse_xml.cpp
index 3df7e19..9a09eae 100644
--- a/parse_xml.cpp
+++ b/parse_xml.cpp
@@ -696,10 +696,13 @@ struct SepolicyConverter : public XmlNodeConverter<Sepolicy> {
 };
 const SepolicyConverter sepolicyConverter{};
 
+[[deprecated]]
 const XmlTextConverter<VndkVersionRange> vndkVersionRangeConverter{"version"};
+
+const XmlTextConverter<std::string> vndkVersionConverter{"version"};
 const XmlTextConverter<std::string> vndkLibraryConverter{"library"};
 
-struct VndkConverter : public XmlNodeConverter<Vndk> {
+struct [[deprecated]] VndkConverter : public XmlNodeConverter<Vndk> {
     std::string elementName() const override { return "vndk"; }
     void mutateNode(const Vndk &object, NodeType *root, DocType *d) const override {
         appendChild(root, vndkVersionRangeConverter(object.mVersionRange, d));
@@ -714,8 +717,26 @@ struct VndkConverter : public XmlNodeConverter<Vndk> {
     }
 };
 
+[[deprecated]]
 const VndkConverter vndkConverter{};
 
+struct VendorNdkConverter : public XmlNodeConverter<VendorNdk> {
+    std::string elementName() const override { return "vendor-ndk"; }
+    void mutateNode(const VendorNdk& object, NodeType* root, DocType* d) const override {
+        appendChild(root, vndkVersionConverter(object.mVersion, d));
+        appendChildren(root, vndkLibraryConverter, object.mLibraries, d);
+    }
+    bool buildObject(VendorNdk* object, NodeType* root) const override {
+        if (!parseChild(root, vndkVersionConverter, &object->mVersion) ||
+            !parseChildren(root, vndkLibraryConverter, &object->mLibraries)) {
+            return false;
+        }
+        return true;
+    }
+};
+
+const VendorNdkConverter vendorNdkConverter{};
+
 struct HalManifestSepolicyConverter : public XmlNodeConverter<Version> {
     std::string elementName() const override { return "sepolicy"; }
     void mutateNode(const Version &m, NodeType *root, DocType *d) const override {
@@ -769,7 +790,12 @@ struct HalManifestConverter : public XmlNodeConverter<HalManifest> {
             }
         } else if (m.mType == SchemaType::FRAMEWORK) {
             if (!(flags & SerializeFlag::NO_VNDK)) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
                 appendChildren(root, vndkConverter, m.framework.mVndks, d);
+#pragma clang diagnostic pop
+
+                appendChildren(root, vendorNdkConverter, m.framework.mVendorNdks, d);
             }
         }
 
@@ -799,6 +825,8 @@ struct HalManifestConverter : public XmlNodeConverter<HalManifest> {
                 return false;
             }
         } else if (object->mType == SchemaType::FRAMEWORK) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             if (!parseChildren(root, vndkConverter, &object->framework.mVndks)) {
                 return false;
             }
@@ -809,6 +837,11 @@ struct HalManifestConverter : public XmlNodeConverter<HalManifest> {
                     return false;
                 }
             }
+#pragma clang diagnostic pop
+
+            if (!parseChildren(root, vendorNdkConverter, &object->framework.mVendorNdks)) {
+                return false;
+            }
         }
         for (auto &&hal : hals) {
             std::string description{hal.name};
@@ -901,7 +934,16 @@ struct CompatibilityMatrixConverter : public XmlNodeConverter<CompatibilityMatri
             }
         } else if (m.mType == SchemaType::DEVICE) {
             if (!(flags & SerializeFlag::NO_VNDK)) {
-                appendChild(root, vndkConverter(m.device.mVndk, d));
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+                if (!(m.device.mVndk == Vndk{})) {
+                    appendChild(root, vndkConverter(m.device.mVndk, d));
+                }
+#pragma clang diagnostic pop
+
+                if (!(m.device.mVendorNdk == VendorNdk{})) {
+                    appendChild(root, vendorNdkConverter(m.device.mVendorNdk, d));
+                }
             }
         }
 
@@ -944,9 +986,16 @@ struct CompatibilityMatrixConverter : public XmlNodeConverter<CompatibilityMatri
         } else if (object->mType == SchemaType::DEVICE) {
             // <vndk> can be missing because it can be determined at build time, not hard-coded
             // in the XML file.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             if (!parseOptionalChild(root, vndkConverter, {}, &object->device.mVndk)) {
                 return false;
             }
+#pragma clang diagnostic pop
+
+            if (!parseOptionalChild(root, vendorNdkConverter, {}, &object->device.mVendorNdk)) {
+                return false;
+            }
         }
 
         if (!kMetaVersion.minorAtLeast(version)) {