| author | Yifan Hong <elsk@google.com> | |
| Thu, 11 Oct 2018 17:38:57 +0000 (10:38 -0700) | ||
| committer | Yifan Hong <elsk@google.com> | |
| Mon, 15 Oct 2018 20:41:04 +0000 (13:41 -0700) | ||
| commit | e7837b164cf04b95ddc1e365bda89d0422b925ad | |
| tree | 60ae6c3f1da9d7e2903d295649ddd6f77159bede | tree | snapshot (tar.xz tar.gz zip) |
| parent | b40e32c92c3d60f59385001a53e7a057fdef37da | commit | diff |
CompatibilityMatrix::combine() combines everything correctly
* Combines <kernel> correctly in order to make assemble_vintf
add <kernel> in any order. That is, we now allow:
assemble_vintf -i base_matrix.xml -i kernel_config_base.xml
-i kernel_config_x86.xml ...
and <kernel>'s will be added in the correct order even when
the order of kernel_config_base.xml and kernel_config_x86.xml
is swapped.
* Combine <sepolicy> and <avb> correctly. They can only
be defined once per level.
Test: libvintf_test
Test: vintf_object_test
Test: build framework compatibility matrix and inspect output manually
Bug: 78943004
Change-Id: I6c90849b8bef0b690fb292bcc5fa8c514f323d96
* Combines <kernel> correctly in order to make assemble_vintf
add <kernel> in any order. That is, we now allow:
assemble_vintf -i base_matrix.xml -i kernel_config_base.xml
-i kernel_config_x86.xml ...
and <kernel>'s will be added in the correct order even when
the order of kernel_config_base.xml and kernel_config_x86.xml
is swapped.
* Combine <sepolicy> and <avb> correctly. They can only
be defined once per level.
Test: libvintf_test
Test: vintf_object_test
Test: build framework compatibility matrix and inspect output manually
Bug: 78943004
Change-Id: I6c90849b8bef0b690fb292bcc5fa8c514f323d96