From 1aecc84239a4b6a0c64f3d068bfd3d6ce85a469b Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 16 May 2017 19:42:18 -0700 Subject: [PATCH] Add entry to fwk compat mat. Test: builds and verify that system/compatibility_matrix.xml has configs filled. Test: `vintf | tail` on marlin shows that fwk compat mat is compatible with runtime info. Bug: 38324908 Change-Id: I8a35ea582fea1faa083c409ec58813c3ac82dc9c Merged-In: I8a35ea582fea1faa083c409ec58813c3ac82dc9c --- target/board/Android.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/target/board/Android.mk b/target/board/Android.mk index e23ab214d2..331367f598 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -83,7 +83,7 @@ $(GEN): PRIVATE_FLAGS := ifeq ($(PRODUCT_FULL_TREBLE),true) ifdef BUILT_VENDOR_MATRIX $(GEN): $(BUILT_VENDOR_MATRIX) -$(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MATRIX)" +$(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MATRIX)" endif endif @@ -110,7 +110,7 @@ $(GEN): PRIVATE_FLAGS := ifeq ($(PRODUCT_FULL_TREBLE),true) ifdef BUILT_VENDOR_MANIFEST $(GEN): $(BUILT_VENDOR_MANIFEST) -$(GEN): PRIVATE_FLAGS := -c "$(BUILT_VENDOR_MANIFEST)" +$(GEN): PRIVATE_FLAGS += -c "$(BUILT_VENDOR_MANIFEST)" endif endif @@ -130,6 +130,14 @@ else FRAMEWORK_VBMETA_VERSION := 0.0 endif +# All kernel versions that the system image works with. +$(GEN): test/vts-testcase/kernel/config/data/android-3.18/android-base.cfg +$(GEN): test/vts-testcase/kernel/config/data/android-4.4/android-base.cfg +$(GEN): test/vts-testcase/kernel/config/data/android-4.9/android-base.cfg +$(GEN): PRIVATE_FLAGS += --kernel=3.18:test/vts-testcase/kernel/config/data/android-3.18/android-base.cfg +$(GEN): PRIVATE_FLAGS += --kernel=4.4:test/vts-testcase/kernel/config/data/android-4.4/android-base.cfg +$(GEN): PRIVATE_FLAGS += --kernel=4.9:test/vts-testcase/kernel/config/data/android-4.9/android-base.cfg + $(GEN): $(FRAMEWORK_COMPATIBILITY_MATRIX_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf # TODO(b/37405869) (b/37715375) inject avb versions as well for devices that have avb enabled. POLICYVERS=$(POLICYVERS) \