From 3737af3e2bc78e28c445a81642014a40e87ce60e Mon Sep 17 00:00:00 2001 From: yanyh2 Date: Fri, 25 Jun 2021 21:12:26 +0800 Subject: [PATCH] adjust moto_f_usbnet driver makefile Adjust the makefile to be compatible with Android S version. Change-Id: Ica70b178ae1b84dce47221c9018a4d35ff6c4363 Signed-off-by: yanyh2 Reviewed-on: https://gerrit.mot.com/1992143 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Haichao Li Reviewed-by: Tao Sun Submit-Approved: Jira Key --- drivers/moto_f_usbnet/Kbuild | 4 ++-- drivers/moto_f_usbnet/Makefile | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/moto_f_usbnet/Kbuild b/drivers/moto_f_usbnet/Kbuild index 2d2cda8e69ec..331c29b3cfa2 100644 --- a/drivers/moto_f_usbnet/Kbuild +++ b/drivers/moto_f_usbnet/Kbuild @@ -1,6 +1,6 @@ # add -Wall to try to catch everything we can. EXTRA_CFLAGS += -Wall -EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include +EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include moto_f_usbnet-objs += f_usbnet.o -obj-m += moto_f_usbnet.o \ No newline at end of file +obj-m += moto_f_usbnet.o diff --git a/drivers/moto_f_usbnet/Makefile b/drivers/moto_f_usbnet/Makefile index 34b09dd815a7..4916d32b6d02 100644 --- a/drivers/moto_f_usbnet/Makefile +++ b/drivers/moto_f_usbnet/Makefile @@ -1,10 +1,17 @@ -KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build +all: modules -all: - $(MAKE) -C $(KERNEL_SRC) M=$(shell pwd) modules $(KBUILD_OPTIONS) +modules: + $(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS) modules_install: - $(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(shell pwd) modules_install + $(MAKE) INSTALL_MOD_STRIP=1 -C $(KERNEL_SRC) M=$(M) modules_install + +%: + $(MAKE) -C $(KERNEL_SRC) M=$(M) $@ $(KBUILD_OPTIONS) clean: - $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean \ No newline at end of file + rm -f *.o *.ko *.mod.c *.mod.o *~ .*.cmd Module.symvers + rm -rf .tmp_versions + +KBUILD_EXTRA_SYMBOLS := $(M)/../../mmi_info/Module.symvers +