commit 8f872a19425262f9c2b946af2264fb8728e434d8
author Chenglu Lin <chenglulin@google.com> Mon Apr 27 20:50:58 2020 +0800
committer Chenglu Lin <chenglulin@google.com> Tue Apr 28 22:23:51 2020 +0800
tree 5806e5c4ab465baa2f70613420c176f95947fcf5
parent ba94b316e2ba896a4dfa4861dcc8a2d4592efb2e

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: Ia41aaacf5b6b37607cfa7082e69661eb7caa8f5e

bramble/BoardConfig.mk

diff --git a/bramble/BoardConfig.mk b/bramble/BoardConfig.mk
index b467d1b..87a781f 100644
--- a/bramble/BoardConfig.mk
+++ b/bramble/BoardConfig.mk
@@ -27,7 +27,11 @@
 TARGET_BOARD_COMMON_PATH := device/google/bramble/sm7250
 
 # DTBO partition definitions
-BOARD_PREBUILT_DTBOIMAGE := device/google/bramble-kernel/dtbo.img
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+    BOARD_PREBUILT_DTBOIMAGE := device/google/bramble-kernel/dtbo.img
+else
+    BOARD_PREBUILT_DTBOIMAGE := device/google/bramble-kernel/performance/dtbo.img
+endif
 
 TARGET_FS_CONFIG_GEN := device/google/bramble/config.fs
 
@@ -48,8 +52,13 @@
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
     $(wildcard device/google/bramble-kernel/debug_api/*.ko)
 else
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
-    $(wildcard device/google/bramble-kernel/*.ko)
+    ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+        BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
+        $(wildcard device/google/bramble-kernel/*.ko)
+    else
+        BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
+        $(wildcard device/google/bramble-kernel/performance/*.ko)
+    endif
 endif
 
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(shell xargs < device/google/bramble-kernel/modules.load)

device-bramble.mk

diff --git a/device-bramble.mk b/device-bramble.mk
index 8a0a712..ec739a2 100644
--- a/device-bramble.mk
+++ b/device-bramble.mk
@@ -17,7 +17,11 @@
 PRODUCT_HARDWARE := bramble
 
 ifeq ($(TARGET_PREBUILT_KERNEL),)
-    LOCAL_KERNEL := device/google/bramble-kernel/Image.lz4
+    ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+        LOCAL_KERNEL := device/google/bramble-kernel/Image.lz4
+    else
+        LOCAL_KERNEL := device/google/bramble-kernel/performance/Image.lz4
+    endif
 else
     LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
 endif