commit afbb82b0525d7bd2e7d1b25d0d171d03c43bb80e
author Yifan Hong <elsk@google.com> Thu Aug 24 15:36:02 2017 -0700
committer Yifan Hong <elsk@google.com> Mon Aug 28 14:34:21 2017 -0700
tree 15fbb27b175da1d21d3796cfe8dec35ec6be3492
parent 0ae807dabb825df76fac5266bb9473a19e440f22

fwk comp mat: add arch specific kernel requirements

Test: m system_compatibility_matrix.xml -j
Bug: 64124223
Change-Id: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c

target/board/Android.mk

diff --git a/target/board/Android.mk b/target/board/Android.mk
index 29ff73b..5504c52 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -135,9 +135,10 @@
 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 :=