commit 72201b82d94ee9d5d90934c8ebc7b4e329719f6a
author Yifan Hong <elsk@google.com> Mon Jul 02 10:15:24 2018 -0700
committer Yifan Hong <elsk@google.com> Mon Jul 02 10:15:54 2018 -0700
tree 1175af05952f632835f70b79fe32301f1384ffb4
parent 13ebc4c20d11fda557205dc13e489320f8c8c774

Allow multiple DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILEs.

Test: multiple DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE is specified, and built
Bug: 68291320
Change-Id: I60358a8b678bc43ced4eec15505c09b245c9764a

CompatibilityMatrix.cpp

diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
index 97f8977..8f6a7a8 100644
--- a/CompatibilityMatrix.cpp
+++ b/CompatibilityMatrix.cpp
@@ -294,7 +294,7 @@
                                  std::string* error) {
     std::map<Level, const std::string*> existingLevels;
     for (const auto& e : matrices) {
-        if (e.object.level() == Level::UNSPECIFIED &&
+        if (e.object.level() != Level::UNSPECIFIED &&
             existingLevels.find(e.object.level()) != existingLevels.end()) {
             if (error) {
                 *error = "Conflict of levels: file \"" +