Select performance kernel for user build

CONFIG_DEBUG_FS is not allowed to be enabled as kernel config
in user builds but is allowed for userdebug builds. Disable
CONFIG_DEBUG_FS in performance kernel and select it for user build.

Bug: 149437148
Test: compile and check kernel config
Change-Id: I184287a0c92b126c8b0d68fa6fdea5e4be48f419
This commit is contained in:
Chenglu Lin 2020-04-27 17:36:16 +08:00 committed by Cyan_Hsieh
parent 92cb177678
commit 15722ff935
2 changed files with 17 additions and 5 deletions

View File

@ -17,7 +17,11 @@
PRODUCT_HARDWARE := redfin
ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_KERNEL := device/google/redfin-kernel/Image.lz4
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
LOCAL_KERNEL := device/google/redfin-kernel/Image.lz4
else
LOCAL_KERNEL := device/google/redfin-kernel/performance/Image.lz4
endif
else
LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
endif

View File

@ -27,8 +27,11 @@ USES_DEVICE_GOOGLE_REDFIN := true
TARGET_BOARD_COMMON_PATH := device/google/redfin/sm7250
# DTBO partition definitions
BOARD_PREBUILT_DTBOIMAGE := device/google/redfin-kernel/dtbo.img
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
BOARD_PREBUILT_DTBOIMAGE := device/google/redfin-kernel/dtbo.img
else
BOARD_PREBUILT_DTBOIMAGE := device/google/redfin-kernel/performance/dtbo.img
endif
TARGET_FS_CONFIG_GEN := device/google/redfin/config.fs
# Kernel modules
@ -48,8 +51,13 @@ else ifeq (,$(filter-out redfin_kernel_debug_api, $(TARGET_PRODUCT)))
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
$(wildcard device/google/redfin-kernel/debug_api/*.ko)
else
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
$(wildcard device/google/redfin-kernel/*.ko)
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
$(wildcard device/google/redfin-kernel/*.ko)
else
BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
$(wildcard device/google/redfin-kernel/performance/*.ko)
endif
endif
# DTB