commit aed51fbaea8e198c99fba2bc0292d9d6c39ac30a
author Chenglu Lin <chenglulin@google.com> Wed Apr 29 14:39:34 2020 +0800
committer Cyan_Hsieh <cyanhsieh@google.com> Fri May 29 21:22:11 2020 +0800
tree 67a56df0b2c51931024af15ba97135738bc494ec
parent ce6bc0cd8dca2484f0336cea9d828f581a4a433a

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

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 @@
     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 @@
 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