From aed51fbaea8e198c99fba2bc0292d9d6c39ac30a Mon Sep 17 00:00:00 2001 From: Chenglu Lin Date: Wed, 29 Apr 2020 14:39:34 +0800 Subject: [PATCH] Add module.load selection for user build Also select dtb from performance kernel. Bug: 149437148 Test: check contents of $OUT/vendor-ramdisk/lib/modules/modules.load Change-Id: I4cd507a84a7a6dc5966ff7e67e4824dfa98f9bfa --- redfin/BoardConfig.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/redfin/BoardConfig.mk b/redfin/BoardConfig.mk index 2c9d0c8..b57e4ca 100644 --- a/redfin/BoardConfig.mk +++ b/redfin/BoardConfig.mk @@ -60,7 +60,11 @@ else endif endif -BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(shell xargs < device/google/redfin-kernel/modules.load) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(shell xargs < device/google/redfin-kernel/modules.load) +else + BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(shell xargs < device/google/redfin-kernel/performance/modules.load) +endif # DTB ifeq (,$(filter-out redfin_kasan, $(TARGET_PRODUCT))) @@ -74,7 +78,11 @@ BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/debug_hang else ifeq (,$(filter-out redfin_kernel_debug_api, $(TARGET_PRODUCT))) BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/debug_api else -BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel + ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel + else + BOARD_PREBUILT_DTBIMAGE_DIR := device/google/redfin-kernel/performance + endif endif # Testing related defines