diff options
author | Yifan Hong | 2017-12-18 18:28:56 -0600 |
---|---|---|
committer | Praneeth Bajjuri | 2018-10-30 23:08:58 -0500 |
commit | 1eba9db3b478947e8c8b254e34b847fa4ca46f35 (patch) | |
tree | 61f53977455f9e10019015c21711125a95ece568 | |
parent | c8b0233f070de2ef661a2abcf37fd6ebc040b39f (diff) | |
download | platform-system-libvintf-d-oreo-mr1-core-release.tar.gz platform-system-libvintf-d-oreo-mr1-core-release.tar.xz platform-system-libvintf-d-oreo-mr1-core-release.zip |
assemble_vintf: allow <kernel> entries from source files.d-oreo-mr1-core-release
The built compatibility_matrix.empty.xml contains <kernel>
entries that gets copied to built framework compatibility matrix.
Test: libvintf_test
Bug: 69636193
Change-Id: I880b1c1ae66a158160e53d5adf241f23c8f68463
-rw-r--r-- | assemble_vintf.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/assemble_vintf.cpp b/assemble_vintf.cpp index 974c7fc..7e6b230 100644 --- a/assemble_vintf.cpp +++ b/assemble_vintf.cpp | |||
@@ -222,16 +222,6 @@ class AssembleVintf { | |||
222 | } | 222 | } |
223 | 223 | ||
224 | bool assembleFrameworkCompatibilityMatrixKernels(CompatibilityMatrix* matrix) { | 224 | bool assembleFrameworkCompatibilityMatrixKernels(CompatibilityMatrix* matrix) { |
225 | if (!matrix->framework.mKernels.empty()) { | ||
226 | // Remove hard-coded <kernel version="x.y.z" /> in legacy files. | ||
227 | std::cerr << "WARNING: framework compatibility matrix has hard-coded kernel" | ||
228 | << " requirements for version"; | ||
229 | for (const auto& kernel : matrix->framework.mKernels) { | ||
230 | std::cerr << " " << kernel.minLts(); | ||
231 | } | ||
232 | std::cerr << ". Hard-coded requirements are removed." << std::endl; | ||
233 | matrix->framework.mKernels.clear(); | ||
234 | } | ||
235 | for (const auto& pair : mKernels) { | 225 | for (const auto& pair : mKernels) { |
236 | std::vector<ConditionedConfig> conditionedConfigs; | 226 | std::vector<ConditionedConfig> conditionedConfigs; |
237 | if (!parseFilesForKernelConfigs(pair.second, &conditionedConfigs)) { | 227 | if (!parseFilesForKernelConfigs(pair.second, &conditionedConfigs)) { |