From 0ae807dabb825df76fac5266bb9473a19e440f22 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Thu, 24 Aug 2017 15:02:24 -0700
Subject: [PATCH 1/2] fwk comp mat: use a for loop for supported kernel
 versions

Test: m system_compatibility_matrix.xml -j

Bug: 64124223
Change-Id: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
---
 target/board/Android.mk | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/target/board/Android.mk b/target/board/Android.mk
index 331367f59..29ff73b24 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -131,12 +131,16 @@ 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
+KERNEL_VERSIONS := 3.18 4.4 4.9
+KERNEL_CONFIG_DATA := test/vts-testcase/kernel/config/data
+
+$(GEN): $(foreach version,$(KERNEL_VERSIONS),\
+	$(KERNEL_CONFIG_DATA)/android-$(version)/android-base.cfg)
+$(GEN): PRIVATE_FLAGS += $(foreach version,$(KERNEL_VERSIONS),\
+	--kernel=$(version):$(KERNEL_CONFIG_DATA)/android-$(version)/android-base.cfg)
+
+KERNEL_VERSIONS :=
+KERNEL_CONFIG_DATA :=
 
 $(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.

From afbb82b0525d7bd2e7d1b25d0d171d03c43bb80e Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Thu, 24 Aug 2017 15:36:02 -0700
Subject: [PATCH 2/2] fwk comp mat: add arch specific kernel requirements

Test: m system_compatibility_matrix.xml -j
Bug: 64124223
Change-Id: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
---
 target/board/Android.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/target/board/Android.mk b/target/board/Android.mk
index 29ff73b24..5504c52b2 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -135,9 +135,10 @@ KERNEL_VERSIONS := 3.18 4.4 4.9
 KERNEL_CONFIG_DATA := test/vts-testcase/kernel/config/data
 
 $(GEN): $(foreach version,$(KERNEL_VERSIONS),\
-	$(KERNEL_CONFIG_DATA)/android-$(version)/android-base.cfg)
+	$(wildcard $(KERNEL_CONFIG_DATA)/android-$(version)/android-base*.cfg))
 $(GEN): PRIVATE_FLAGS += $(foreach version,$(KERNEL_VERSIONS),\
-	--kernel=$(version):$(KERNEL_CONFIG_DATA)/android-$(version)/android-base.cfg)
+	--kernel=$(version):$(call normalize-path-list,\
+		$(wildcard $(KERNEL_CONFIG_DATA)/android-$(version)/android-base*.cfg)))
 
 KERNEL_VERSIONS :=
 KERNEL_CONFIG_DATA :=