From 6fb73ee052b3e717a15c27cb135c76f46485094d Mon Sep 17 00:00:00 2001 From: a7301c Date: Sat, 7 Mar 2020 07:54:34 -0600 Subject: [PATCH] Pass absolute path of "TOP" to Kbuild. In R, Only a few limite environment variables are passed to ninjia, others will be cleared. So, pass this "TOP" specically to kernel modules build. And have to be absolute path. Otherwise, the header can't be located. Change-Id: I7820e3d8112611c1c16a1807ea57ab9949416918 Reviewed-on: https://gerrit.mot.com/1508821 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-by: Yinjun Chen Reviewed-on: https://gerrit.mot.com/1540154 --- AndroidKernelModule.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidKernelModule.mk b/AndroidKernelModule.mk index b16f8fb62ede..6490fe1ab655 100644 --- a/AndroidKernelModule.mk +++ b/AndroidKernelModule.mk @@ -154,12 +154,12 @@ ifneq ($(USE_CLANG_FOR_MODULES),) $(KBUILD_TARGET): $(TARGET_PREBUILT_INT_KERNEL) @mkdir -p $(kbuild_out_dir) $(hide) cp -f $(local_path)/Kbuild $(kbuild_out_dir)/Kbuild - $(MAKE) -C $(TARGET_KERNEL_SOURCE) M=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(local_path) O=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) modules $(kbuild_options) ANDROID_BUILD_TOP=$$(pwd) + $(MAKE) -C $(TARGET_KERNEL_SOURCE) M=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(local_path) O=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) modules $(kbuild_options) ANDROID_BUILD_TOP=$$(pwd) TOP=$$(pwd) else $(KBUILD_TARGET): $(TARGET_PREBUILT_INT_KERNEL) @mkdir -p $(kbuild_out_dir) $(hide) cp -f $(local_path)/Kbuild $(kbuild_out_dir)/Kbuild - $(MAKE) -C $(TARGET_KERNEL_SOURCE) M=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(local_path) O=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS) modules $(kbuild_options) + $(MAKE) -C $(TARGET_KERNEL_SOURCE) M=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(local_path) O=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS) modules $(kbuild_options) TOP=$$(pwd) endif # Once the KBUILD_OPTIONS variable has been used for the target