commit e88e16721117aaf97548bebbffd6c8ea81b681ef
author Yifan Hong <elsk@google.com> Thu Aug 24 14:42:54 2017 -0700
committer Yifan Hong <elsk@google.com> Mon Aug 28 17:37:33 2017 -0700
tree af4b873b429961f569bfc45dc7a7358a1db42164
parent c6535d15042279ed7fa3b4fdd844e268b5d7dc01

assemble_vintf: add assembleFrameworkCompatibilityMatrixKernels

Refactor code to execute the procedure of processing
android-base.cfg files in a separate function.

Test: m system_compatibility_matrix.xml -j
Bug: 64124223
Change-Id: Ic6159fe3b6e69687a9a062f34e95e05733e7308a
Merged-In: Ic6159fe3b6e69687a9a062f34e95e05733e7308a

assemble_vintf.cpp

diff --git a/assemble_vintf.cpp b/assemble_vintf.cpp
index d75e889..febb2d9 100644
--- a/assemble_vintf.cpp
+++ b/assemble_vintf.cpp
@@ -154,6 +154,28 @@
         return true;
     }
 
+    bool assembleFrameworkCompatibilityMatrixKernels(CompatibilityMatrix* matrix) {
+        for (const auto& pair : mKernels) {
+            std::vector<KernelConfig> configs;
+            if (!parseFilesForKernelConfigs(pair.second, &configs)) {
+                return false;
+            }
+            bool added = false;
+            for (auto& e : matrix->framework.mKernels) {
+                if (e.minLts() == pair.first) {
+                    e.mConfigs.insert(e.mConfigs.end(), configs.begin(), configs.end());
+                    added = true;
+                    break;
+                }
+            }
+            if (!added) {
+                matrix->framework.mKernels.push_back(
+                    MatrixKernel{KernelVersion{pair.first}, std::move(configs)});
+            }
+        }
+        return true;
+    }
+
     bool assembleCompatibilityMatrix(CompatibilityMatrix* matrix) {
         std::string error;
 
@@ -166,24 +188,11 @@
             if (!getFlag("POLICYVERS", &kernelSepolicyVers)) {
                 return false;
             }
-            for (const auto& pair : mKernels) {
-                std::vector<KernelConfig> configs;
-                if (!parseFilesForKernelConfigs(pair.second, &configs)) {
-                    return false;
-                }
-                bool added = false;
-                for (auto& e : matrix->framework.mKernels) {
-                    if (e.minLts() == pair.first) {
-                        e.mConfigs.insert(e.mConfigs.end(), configs.begin(), configs.end());
-                        added = true;
-                        break;
-                    }
-                }
-                if (!added) {
-                    matrix->framework.mKernels.push_back(
-                        MatrixKernel{KernelVersion{pair.first}, std::move(configs)});
-                }
+
+            if (!assembleFrameworkCompatibilityMatrixKernels(matrix)) {
+                return false;
             }
+
             matrix->framework.mSepolicy =
                 Sepolicy(kernelSepolicyVers, {{sepolicyVers.majorVer, sepolicyVers.minorVer}});