From 54fc960b31591ca019642be333f141fbfcc818b5 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Fri, 8 Jul 2022 11:14:24 -0700 Subject: [PATCH] ANDROID: disable trimming for ARM64. Turn off trimming of symbols so we do not need to keep a set of valid symbol tables during the development cycle of the android14-5.15 branch. Bug: 188620248 Change-Id: I4f3bc558aca8432b77e7a855bcc75443e7af8ba3 Signed-off-by: Yifan Hong Signed-off-by: Greg Kroah-Hartman --- BUILD.bazel | 6 ++++++ build.config.gki.aarch64 | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 0d7dfe2bb0f4..69c93584bc3c 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -26,12 +26,18 @@ load("//build/kernel/kleaf:common_kernels.bzl", "define_common_kernels", "define # or TRIM_NONLISTED_KMI changes, override kmi_configs here. define_common_kernels(target_configs = { "kernel_aarch64": { + # TODO(b/188620248): re-enable trimming + "trim_nonlisted_kmi": False, + "kmi_symbol_list_strict_mode": False, "module_outs": [ "drivers/block/zram/zram.ko", "mm/zsmalloc.ko", ], }, "kernel_aarch64_debug": { + # TODO(b/188620248): re-enable trimming + "trim_nonlisted_kmi": False, + "kmi_symbol_list_strict_mode": False, "module_outs": [ "drivers/block/zram/zram.ko", "mm/zsmalloc.ko", diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index 929d2d07fe89..70f9b2644469 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -35,8 +35,9 @@ arch/arm64/boot/Image.gz " # Update BUILD.bazel, define_common_kernels() if the value is not 1. -TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1} -KMI_SYMBOL_LIST_STRICT_MODE=${KMI_SYMBOL_LIST_STRICT_MODE:-1} +# TODO(b/188620248): Re-enable trimming +# TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1} +# KMI_SYMBOL_LIST_STRICT_MODE=${KMI_SYMBOL_LIST_STRICT_MODE:-1} BUILD_SYSTEM_DLKM=1 MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules