From 09e0f8509684d14f06d86c4de0f9f2d635d04b40 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Fri, 9 Jun 2023 11:26:47 -0700 Subject: [PATCH] ANDROID: set CONFIG_IKHEADERS=m for gki_defconfig. The tarball, when implemented correctly, adds around 3.7MB of kheaders.tar.xz to the kernel image, which increases memory usage. Since this tarball is usually for debugging only, mark it as a module so it can be conditionally loaded. Bug: 276339429 Test: treehugger Change-Id: Icc330a947ff25006fa48ffc5801d7a2746369893 Signed-off-by: Yifan Hong --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- modules.bzl | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index b5f94b9c589c..96c25dac49b0 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -17,7 +17,7 @@ CONFIG_RCU_BOOST=y CONFIG_RCU_NOCB_CPU=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_IKHEADERS=y +CONFIG_IKHEADERS=m CONFIG_UCLAMP_TASK=y CONFIG_UCLAMP_BUCKETS_COUNT=20 CONFIG_CGROUPS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 8bb611814d74..3de37f103032 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -19,7 +19,7 @@ CONFIG_RCU_BOOST=y CONFIG_RCU_NOCB_CPU=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_IKHEADERS=y +CONFIG_IKHEADERS=m CONFIG_UCLAMP_TASK=y CONFIG_UCLAMP_BUCKETS_COUNT=20 CONFIG_CGROUPS=y diff --git a/modules.bzl b/modules.bzl index 6a14c5fcf746..5d3d31af91f7 100644 --- a/modules.bzl +++ b/modules.bzl @@ -37,6 +37,7 @@ COMMON_GKI_MODULES_LIST = [ "drivers/usb/class/cdc-acm.ko", "drivers/usb/serial/ftdi_sio.ko", "drivers/usb/serial/usbserial.ko", + "kernel/kheaders.ko", "lib/crypto/libarc4.ko", "mm/zsmalloc.ko", "net/6lowpan/6lowpan.ko",