1 files changed, 69 insertions, 1 deletions

diff --git a/HalManifest.cpp b/HalManifest.cpp
index 45816f6..20ed7eb 100644
--- a/HalManifest.cpp
+++ b/HalManifest.cpp
@@ -24,6 +24,8 @@
 #include <mutex>
 #include <set>
 
+#include <android-base/strings.h>
+
 #include "parse_string.h"
 #include "parse_xml.h"
 #include "utils.h"
@@ -37,6 +39,9 @@ bool HalManifest::shouldAdd(const ManifestHal& hal) const {
     if (!hal.isValid()) {
         return false;
     }
+    if (hal.isOverride) {
+        return true;
+    }
     auto existingHals = mHals.equal_range(hal.name);
     std::set<size_t> existingMajorVersions;
     for (auto it = existingHals.first; it != existingHals.second; ++it) {
@@ -53,6 +58,48 @@ bool HalManifest::shouldAdd(const ManifestHal& hal) const {
     return true;
 }
 
+// Remove elements from "list" if p(element) returns true.
+template <typename List, typename Predicate>
+static void removeIf(List& list, Predicate predicate) {
+    for (auto it = list.begin(); it != list.end();) {
+        if (predicate(*it)) {
+            it = list.erase(it);
+        } else {
+            ++it;
+        }
+    }
+}
+
+void HalManifest::removeHals(const std::string& name, size_t majorVer) {
+    removeIf(mHals, [&name, majorVer](auto& existingHalPair) {
+        auto& existingHal = existingHalPair.second;
+        if (existingHal.name != name) {
+            return false;
+        }
+        auto& existingVersions = existingHal.versions;
+        removeIf(existingVersions, [majorVer](const auto& existingVersion) {
+            return existingVersion.majorVer == majorVer;
+        });
+        return existingVersions.empty();
+    });
+}
+
+bool HalManifest::add(ManifestHal&& halToAdd) {
+    if (halToAdd.isOverride) {
+        if (halToAdd.versions.empty()) {
+            // Special syntax when there are no <version> tags at all. Remove all existing HALs
+            // with the given name.
+            mHals.erase(halToAdd.name);
+        }
+        // If there are <version> tags, remove all existing major versions that causes a conflict.
+        for (const Version& versionToAdd : halToAdd.versions) {
+            removeHals(halToAdd.name, versionToAdd.majorVer);
+        }
+    }
+
+    return HalGroup::add(std::move(halToAdd));
+}
+
 bool HalManifest::shouldAddXmlFile(const ManifestXmlFile& xmlFile) const {
     auto existingXmlFiles = getXmlFiles(xmlFile.name());
     for (auto it = existingXmlFiles.first; it != existingXmlFiles.second; ++it) {
@@ -254,6 +301,22 @@ static bool checkVendorNdkCompatibility(const VendorNdk& matVendorNdk,
     return false;
 }
 
+static bool checkSystemSdkCompatibility(const SystemSdk& matSystemSdk,
+                                        const SystemSdk& manifestSystemSdk, std::string* error) {
+    SystemSdk notSupported = matSystemSdk.removeVersions(manifestSystemSdk);
+    if (!notSupported.empty()) {
+        if (error) {
+            *error =
+                "The following System SDK versions are required by device "
+                "compatibility matrix but not supported by the framework manifest: [" +
+                base::Join(notSupported.versions(), ", ") + "]. Supported versions are: [" +
+                base::Join(manifestSystemSdk.versions(), ", ") + "].";
+        }
+        return false;
+    }
+    return true;
+}
+
 bool HalManifest::checkCompatibility(const CompatibilityMatrix &mat, std::string *error) const {
     if (mType == mat.mType) {
         if (error != nullptr) {
@@ -277,6 +340,10 @@ bool HalManifest::checkCompatibility(const CompatibilityMatrix &mat, std::string
         if (!checkVendorNdkCompatibility(mat.device.mVendorNdk, framework.mVendorNdks, error)) {
             return false;
         }
+
+        if (!checkSystemSdkCompatibility(mat.device.mSystemSdk, framework.mSystemSdk, error)) {
+            return false;
+        }
     } else if (mType == SchemaType::DEVICE) {
         bool match = false;
         for (const auto &range : mat.framework.mSepolicy.sepolicyVersions()) {
@@ -379,7 +446,8 @@ bool operator==(const HalManifest &lft, const HalManifest &rgt) {
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
                 lft.framework.mVndks == rgt.framework.mVndks &&
 #pragma clang diagnostic pop
-                lft.framework.mVendorNdks == rgt.framework.mVendorNdks));
+                lft.framework.mVendorNdks == rgt.framework.mVendorNdks &&
+                lft.framework.mSystemSdk == rgt.framework.mSystemSdk));
 }
 
 } // namespace vintf