From a140670b7a68f61fb1df3927a2f0b6a5c654a1fe Mon Sep 17 00:00:00 2001 From: Qian-Hao Huang Date: Tue, 23 Apr 2024 23:33:06 +0800 Subject: [PATCH 1/2] gs201: Change the path of prebuilt fips140.ko Placing the fips140.ko at the same level as other kernel modules makes it easier for automation tools to handle all of them. Bug: 331791671 Change-Id: I7d69226d594fe068a6ccb99bb5a29620468f4aed Signed-off-by: Qian-Hao Huang --- BoardConfig-common.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 2eab1573..48d30a44 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -387,9 +387,8 @@ endif BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist # Prebuilt kernel modules that are *not* listed in vendor_kernel_boot.modules.load -BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES = fips140/fips140.ko +BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES = fips140.ko BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k))) -KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA)) # Kernel modules that are listed in vendor_kernel_boot.modules.load BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load)) From 6cef6b07d18864844c4e0d9c92c0b1bba292a265 Mon Sep 17 00:00:00 2001 From: Herbert Xue Date: Fri, 12 Apr 2024 11:00:16 +0800 Subject: [PATCH 2/2] Update USES_LASSEN_MODEM soong config settings for aosp projects. Add the flag "use_lassen_modem" for bp to do the same checking like "USES_LASSEN_MODEM" in mk. Bug: 330654744 Test: 1. lunch aosp_cheetah-trunk_staging-userdebug 2. m RilConfigService Change-Id: Icb99b639837237b2afeea858de14669d583bf385 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index d15c21d4..c11e291f 100644 --- a/device.mk +++ b/device.mk @@ -201,6 +201,7 @@ USE_LASSEN_OEMHOOK := true # Use for GRIL USES_LASSEN_MODEM := true +$(call soong_config_set, vendor_ril_google_feature, use_lassen_modem, true) ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true) USE_GOOGLE_DIALER := true