From 9aba4987efeda0697ea8be06ed8a35c1557659b4 Mon Sep 17 00:00:00 2001 From: Lecopzer Chen Date: Fri, 29 Apr 2022 16:37:36 +0800 Subject: [PATCH] ANDROID: fix KCFLAGS override by __ANDROID_COMMON_KERNEL__ Our test build is broken by KCFLAGS overrided in build.config.comm. Since Linux Makefile supports 'export KCFLAGS=XXX' to customize the KCFLAGS, and we should keep this functionality. Bug: 230818006 Fixes: 1a596d33308e ("ANDROID: Add flag to indicate compiling against ACK") Signed-off-by: Lecopzer Chen Change-Id: I9425d79697bc1fe816ce82d523f91631dee6b8f4 --- build.config.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.config.common b/build.config.common index 57e04fdb5e1a..3106a149adf6 100644 --- a/build.config.common +++ b/build.config.common @@ -8,7 +8,7 @@ CLANG_PREBUILT_BIN=prebuilts/clang/host/linux-x86/clang-${CLANG_VERSION}/bin BUILDTOOLS_PREBUILT_BIN=build/kernel/build-tools/path/linux-x86 DTC=${ROOT_DIR}/${BUILDTOOLS_PREBUILT_BIN}/dtc -KCFLAGS=-D__ANDROID_COMMON_KERNEL__ +KCFLAGS="${KCFLAGS} -D__ANDROID_COMMON_KERNEL__" EXTRA_CMDS='' STOP_SHIP_TRACEPRINTK=1 IN_KERNEL_MODULES=1