Snap for 4585119 from 8dc9be49a0b77b3c164c47eb6c8d88c57b65deed to pi-release

Change-Id: I1425589f63a868c5b3a7ebf9d5d4ece648132086

4 files changed, 39 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 8a11dab..375246c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,9 +67,6 @@ cc_library {
             srcs: [
                 "RuntimeInfo-host.cpp"
             ],
-            cflags: [
-                "-DLIBVINTF_HOST",
-            ],
         },
         android: {
             shared_libs: [
diff --git a/parse_xml.cpp b/parse_xml.cpp
index 5900f27..7abbc55 100644
--- a/parse_xml.cpp
+++ b/parse_xml.cpp
@@ -513,7 +513,7 @@ struct MatrixHalConverter : public XmlNodeConverter<MatrixHal> {
             }
         }
 // Do not check for target-side libvintf to avoid restricting ability for upgrade accidentally.
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
         if (!checkAdditionalRestrictionsOnHal(*object)) {
             return false;
         }
@@ -521,7 +521,7 @@ struct MatrixHalConverter : public XmlNodeConverter<MatrixHal> {
         return true;
     }
 
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
    private:
     bool checkAdditionalRestrictionsOnHal(const MatrixHal& hal) const {
         if (hal.getName() == "netutils-wrapper") {
@@ -650,7 +650,7 @@ struct ManifestHalConverter : public XmlNodeConverter<ManifestHal> {
             return false;
         }
 // Do not check for target-side libvintf to avoid restricting upgrade accidentally.
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
         if (!checkAdditionalRestrictionsOnHal(*object)) {
             return false;
         }
@@ -658,7 +658,7 @@ struct ManifestHalConverter : public XmlNodeConverter<ManifestHal> {
         return true;
     }
 
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
    private:
     bool checkAdditionalRestrictionsOnHal(const ManifestHal& hal) const {
         if (hal.getName() == "netutils-wrapper") {
@@ -866,6 +866,16 @@ struct HalManifestConverter : public XmlNodeConverter<HalManifest> {
                 return false;
             }
 
+            std::set<std::string> vendorNdkVersions;
+            for (const auto& vendorNdk : object->framework.mVendorNdks) {
+                if (vendorNdkVersions.find(vendorNdk.version()) != vendorNdkVersions.end()) {
+                    this->mLastError =
+                        "Duplicated manifest.vendor-ndk.version " + vendorNdk.version();
+                    return false;
+                }
+                vendorNdkVersions.insert(vendorNdk.version());
+            }
+
             if (!parseOptionalChild(root, systemSdkConverter, {}, &object->framework.mSystemSdk)) {
                 return false;
             }
diff --git a/test/Android.bp b/test/Android.bp
index d2121c6..6777ca3 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -39,9 +39,9 @@ cc_test {
         "-Wno-deprecated-declarations",
     ],
     target: {
-        host: {
-            cflags: ["-DLIBVINTF_HOST"],
-        }
+        android: {
+            cflags: ["-DLIBVINTF_TARGET"],
+        },
     }
 }
 
diff --git a/test/LibVintfTest.cpp b/test/LibVintfTest.cpp
index e7a609a..ef19a4c 100644
--- a/test/LibVintfTest.cpp
+++ b/test/LibVintfTest.cpp
@@ -44,7 +44,7 @@ static bool In(const std::string& sub, const std::string& str) {
 }
 #define EXPECT_IN(sub, str) EXPECT_TRUE(In((sub), (str))) << (str);
 
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
 #define EXPECT_CONTAINS(str, sub) EXPECT_IN(sub, str);
 #endif
 
@@ -1598,7 +1598,7 @@ TEST_F(LibVintfTest, NetutilsWrapperMatrix) {
         << gCompatibilityMatrixConverter.lastError();
 
 // only host libvintf hardcodes netutils-wrapper version requirements
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
 
     matrixXml =
         "<compatibility-matrix version=\"1.0\" type=\"device\">"
@@ -1640,7 +1640,7 @@ TEST_F(LibVintfTest, NetutilsWrapperMatrix) {
         "netutils-wrapper HAL must specify exactly one version x.0, but multiple <version> element "
         "is specified.");
 
-#endif  // LIBVINTF_HOST
+#endif  // LIBVINTF_TARGET
 }
 
 TEST_F(LibVintfTest, NetutilsWrapperManifest) {
@@ -1658,7 +1658,7 @@ TEST_F(LibVintfTest, NetutilsWrapperManifest) {
     EXPECT_TRUE(gHalManifestConverter(&manifest, manifestXml)) << gHalManifestConverter.lastError();
 
 // only host libvintf hardcodes netutils-wrapper version requirements
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
 
     manifestXml =
         "<manifest version=\"1.0\" type=\"framework\">"
@@ -1687,7 +1687,7 @@ TEST_F(LibVintfTest, NetutilsWrapperManifest) {
         "netutils-wrapper HAL must specify exactly one version x.0, but multiple <version> element "
         "is specified.");
 
-#endif  // LIBVINTF_HOST
+#endif  // LIBVINTF_TARGET
 }
 
 TEST_F(LibVintfTest, KernelConfigConditionTest) {
@@ -2410,6 +2410,23 @@ TEST_F(LibVintfTest, MissingVendorNdkInMatrix) {
     }
 }
 
+TEST_F(LibVintfTest, DuplicatedVendorNdkVersion) {
+    std::string error;
+    HalManifest manifest;
+    std::string xml =
+        "<manifest version=\"1.0\" type=\"framework\">\n"
+        "    <vendor-ndk>\n"
+        "        <version>27</version>\n"
+        "    </vendor-ndk>\n"
+        "    <vendor-ndk>\n"
+        "        <version>27</version>\n"
+        "    </vendor-ndk>\n"
+        "</manifest>\n";
+
+    EXPECT_FALSE(gHalManifestConverter(&manifest, xml));
+    EXPECT_EQ("Duplicated manifest.vendor-ndk.version 27", gHalManifestConverter.lastError());
+}
+
 TEST_F(LibVintfTest, ManifestHalOverride) {
     HalManifest manifest;
     std::string xml =