From 15722ff935bd81821d91fa4e8993fb79e5b69ff1 Mon Sep 17 00:00:00 2001
From: Chenglu Lin <chenglulin@google.com>
Date: Mon, 27 Apr 2020 17:36:16 +0800
Subject: [PATCH] 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
---
 device-redfin.mk      |  6 +++++-
 redfin/BoardConfig.mk | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/device-redfin.mk b/device-redfin.mk
index 1c6ce0f..46183f6 100644
--- a/device-redfin.mk
+++ b/device-redfin.mk
@@ -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
diff --git a/redfin/BoardConfig.mk b/redfin/BoardConfig.mk
index 5f08d37..c43db9d 100644
--- a/redfin/BoardConfig.mk
+++ b/redfin/BoardConfig.mk
@@ -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