Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 290dabda authored by dianlujitao's avatar dianlujitao Committed by Bruno Martins
Browse files

kernel: Automatically adapt path suffix for GKI modules 

It has been noticed that sm8750 no longer puts GKI modules in the
subdirectory. Moreover, this seems to be something specific to QCOM,
so guard it as such.

Change-Id: Iac9c895c9c1eef06b2e4ce75bd7c5c2aa356fbb1
parent e3b4bf2b

build/tasks/kernel.mk

+8 −2
Original line number Diff line number Diff line
@@ -106,7 +106,13 @@ KERNEL_CONFIG := $(KERNEL_OUT)/.config 
KERNEL_RELEASE := $(KERNEL_OUT)/include/config/kernel.release

RECOVERY_KERNEL_CONFIG := $(RECOVERY_KERNEL_OUT)/.config

RECOVERY_KERNEL_RELEASE := $(RECOVERY_KERNEL_OUT)/include/config/kernel.release

GKI_SUFFIX := $(shell echo android$(PLATFORM_VERSION)-$(TARGET_KERNEL_VERSION))

ifeq ($(BOARD_USES_QCOM_HARDWARE),true)

ifeq ($(shell expr $(TARGET_KERNEL_VERSION) \>= 5.15), 1)

ifeq ($(shell expr $(TARGET_KERNEL_VERSION) \<= 6.1), 1)

GKI_SUFFIX := /$(shell echo android$(PLATFORM_VERSION)-$(TARGET_KERNEL_VERSION))

endif

endif

endif



ifeq ($(KERNEL_ARCH),x86_64)

KERNEL_DEFCONFIG_ARCH := x86
@@ -536,7 +542,7 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(KERNEL_MODULE 
					if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from SYSTEM_KERNEL_MODULES was not found" 1>&2 && exit 1; fi; \

				done); \

				[ $$? -ne 0 ] && exit 1; \

				($(call build-image-kernel-modules-lineage,$$gki_modules,$(SYSTEM_KERNEL_MODULES_OUT),$(SYSTEM_KERNEL_MODULE_MOUNTPOINT)/,$(SYSTEM_KERNEL_DEPMOD_STAGING_DIR),$(BOARD_SYSTEM_KERNEL_MODULES_LOAD),/$(GKI_SUFFIX),$(SYSTEM_KERNEL_MODULES_PARTITION_FILE_LIST),)) || exit "$$?"; \

				($(call build-image-kernel-modules-lineage,$$gki_modules,$(SYSTEM_KERNEL_MODULES_OUT),$(SYSTEM_KERNEL_MODULE_MOUNTPOINT)/,$(SYSTEM_KERNEL_DEPMOD_STAGING_DIR),$(BOARD_SYSTEM_KERNEL_MODULES_LOAD),$(GKI_SUFFIX),$(SYSTEM_KERNEL_MODULES_PARTITION_FILE_LIST),)) || exit "$$?"; \

				filtered_modules=$$(for n in $$all_modules; do \

					module_name=$$(basename $$n); \

					if [[ ! "$(SYSTEM_KERNEL_MODULES)" =~ "$$module_name" ]]; then echo $$n; fi; \