From 5d6c6412e0a894f11f9a21599918751f60b6b6de Mon Sep 17 00:00:00 2001 From: a7301c Date: Mon, 29 Jun 2020 14:39:00 -0500 Subject: [PATCH] Use kernel_definitions.mk if AndroidKernel.mk not existed Since all the definitions of Qcom's kernel 5.4 are now in device/qcom/kernelscripts/kernel_definitions.mk, And AndroidKernelModule.mk is removed in kernel 5.4. So include kernel_definitions.mk instead for baseline that does not have AndroidKernelModule.mk. Change-Id: I3b995554697d04f06658448eedd19f98e6196db2 Signed-off-by: a7301c Reviewed-on: https://gerrit.mot.com/1650768 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Zhenxin Xi --- AndroidKernelModule.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/AndroidKernelModule.mk b/AndroidKernelModule.mk index 6490fe1ab655..eb7036d56d77 100644 --- a/AndroidKernelModule.mk +++ b/AndroidKernelModule.mk @@ -72,12 +72,17 @@ endif # To ensure KERNEL_OUT and TARGET_PREBUILT_INT_KERNEL are defined, -# kernel/AndroidKernel.mk must be included. While m and regular +# kernel/AndroidKernel.mk (kernel_definitions.mk) must be included. While m and regular # make builds will include kernel/AndroidKernel.mk, mm and mmm builds -# do not. Therefore, we need to explicitly include kernel/AndroidKernel.mk. +# do not. Therefore, we need to explicitly include kernel/AndroidKernel.mk (kernel_definitions.mk). # It is safe to include it more than once because the entire file is # guarded by "ifeq ($(TARGET_PREBUILT_KERNEL),) ... endif". +# If AndroidKernel.mk is not found, fall back to use the kernel_definitions.mk +ifneq ($(wildcard $(TARGET_KERNEL_SOURCE)/AndroidKernel.mk),) TARGET_KERNEL_PATH := $(TARGET_KERNEL_SOURCE)/AndroidKernel.mk +else +TARGET_KERNEL_PATH := device/qcom/kernelscripts/kernel_definitions.mk +endif include $(TARGET_KERNEL_PATH) # Simply copy the kernel module from where the kernel build system