Pixel 2: build.config: use clang on debug builds

Change-Id: I86b7c7e744d3b8d15aca38429f3c54a9df10b07f Signed-off-by: Petri Gynther <[email protected]> (cherry picked from commit ca4e599f785bc3b22a43fe5c2e0535457a71fef7)
kerneltoast · Sep 24, 2019 · 10fa92b · 10fa92b
1 parent 075f35e
commit 10fa92b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/build.config.debug_api b/build.config.debug_api
@@ -1,5 +1,5 @@
 KERNEL_DIR=private/msm-google
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
 POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
 
 function update_debug_config() {

diff --git a/build.config.debug_hang b/build.config.debug_hang
@@ -1,5 +1,5 @@
 KERNEL_DIR=private/msm-google
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
 POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
 
 function update_debug_config() {

diff --git a/build.config.debug_locking b/build.config.debug_locking
@@ -1,5 +1,5 @@
 KERNEL_DIR=private/msm-google
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
 POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
 
 function update_debug_config() {

diff --git a/build.config.debug_memory b/build.config.debug_memory
@@ -1,5 +1,5 @@
 KERNEL_DIR=private/msm-google
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
 POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
 
 function update_debug_config() {

diff --git a/build.config.kasan b/build.config.kasan
@@ -1,5 +1,5 @@
 KERNEL_DIR=private/msm-google
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
 POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config"
 
 function update_kasan_config() {
@@ -14,7 +14,9 @@ function update_kasan_config() {
          -d CONFIG_SLUB_DEBUG_PANIC_ON \
          -d CONFIG_KASAN_OUTLINE \
          -d CONFIG_KERNEL_LZ4 \
-	 -d CONFIG_RANDOMIZE_BASE
+         -d CONFIG_RANDOMIZE_BASE \
+         -d CONFIG_CC_WERROR \
+         --set-val CONFIG_FRAME_WARN 0
     (cd ${OUT_DIR} && \
      make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
 }