commit 5bb4fbf5662ae0d62511de468c47e8500ce49feb
author Yifan Hong <elsk@google.com> Tue Sep 10 14:47:28 2019 -0700
committer Yifan Hong <elsk@google.com> Tue Sep 10 14:50:53 2019 -0700
tree 0f55d2a9dfa89ced9c47e453184a533aa7eace5b
parent 77e609a14ff80e3b98cb323ab20349d9efacd210

Fix matrix combine logic for AIDL HALs.

Also, add loads of tests for matrix / manifest combine.
Fixes: 140590973
Test: libvintf_test
Test: vintf_object_test
Change-Id: Ifbf5026953d0e350834dc9a055d6528bb4bfcdc4

CompatibilityMatrix.cpp

diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
index 0ecb82c..1e519e0 100644
--- a/CompatibilityMatrix.cpp
+++ b/CompatibilityMatrix.cpp
@@ -186,6 +186,11 @@
                                      const std::string& interface,
                                      const std::string& instanceOrPattern, bool isRegex) {
             for (auto* existingHal : existingHals) {
+                // Ignore HALs with different format.
+                if (halToAdd.format != existingHal->format) {
+                    continue;
+                }
+
                 MatrixHal* splitInstance =
                     this->splitInstance(existingHal, interface, instanceOrPattern, isRegex);
                 if (splitInstance != nullptr) {