Skip to content

Commit 6030b2b

Browse files
author
Petri Gynther
committed
build.config: factor out common stuff
Create build.config.common and build.config.common.clang to factor out all the common stuff in the build scripts. Modeled after Pixel 3 build scripts. Change-Id: I3a773ffd89c086924dff350d19e255106284e7da Signed-off-by: Petri Gynther <[email protected]>
1 parent b11a6ce commit 6030b2b

10 files changed

+55
-176
lines changed

‎build.config

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,6 @@
1-
ARCH=arm64
2-
BRANCH=android-msm-wahoo-4.4
3-
CC=clang
4-
CLANG_TRIPLE=aarch64-linux-gnu-
5-
CROSS_COMPILE=aarch64-linux-android-
6-
CROSS_COMPILE_ARM32=arm-linux-androideabi-
7-
DEFCONFIG=wahoo_defconfig
8-
EXTRA_CMDS=''
91
KERNEL_DIR=private/msm-google
10-
POST_DEFCONFIG_CMDS='check_defconfig'
11-
CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r346389b/bin/
12-
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
13-
LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
14-
LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
15-
DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
16-
LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
17-
FILES="
18-
arch/arm64/boot/dtbo.img
19-
arch/arm64/boot/Image.lz4-dtb
20-
vmlinux
21-
System.map
22-
"
23-
IN_KERNEL_MODULES=1
24-
STOP_SHIP_TRACEPRINTK=1
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
3+
POST_DEFCONFIG_CMDS="check_defconfig"
254
UNSTRIPPED_MODULES="
265
wlan.ko
276
"

‎build.config.common

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
ARCH=arm64
2+
BRANCH=android-msm-wahoo-4.4
3+
CROSS_COMPILE=aarch64-linux-android-
4+
CROSS_COMPILE_ARM32=arm-linux-androideabi-
5+
DEFCONFIG=wahoo_defconfig
6+
EXTRA_CMDS=''
7+
CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r346389b/bin/
8+
LD_LIBRARY_PATH=${ROOT_DIR}/prebuilts-master/clang/host/linux-x86/clang-r346389b/lib64:$LD_LIBRARY_PATH
9+
export LD_LIBRARY_PATH
10+
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
11+
LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
12+
LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
13+
DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
14+
LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
15+
FILES="
16+
arch/arm64/boot/dtbo.img
17+
arch/arm64/boot/Image.lz4-dtb
18+
vmlinux
19+
System.map
20+
.config
21+
"
22+
IN_KERNEL_MODULES=1
23+
STOP_SHIP_TRACEPRINTK=1

‎build.config.common.clang

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
2+
CC=clang
3+
CLANG_TRIPLE=aarch64-linux-gnu-

‎build.config.debug_api

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
KERNEL_DIR=private/msm-google
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
3+
POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
4+
15
function update_debug_config() {
26
${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
37
-e CONFIG_DMA_API_DEBUG \
@@ -12,24 +16,3 @@ function update_debug_config() {
1216
(cd ${OUT_DIR} && \
1317
make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
1418
}
15-
16-
ARCH=arm64
17-
BRANCH=android-msm-wahoo-4.4
18-
CROSS_COMPILE=aarch64-linux-android-
19-
CROSS_COMPILE_ARM32=arm-linux-androideabi-
20-
DEFCONFIG=wahoo_defconfig
21-
EXTRA_CMDS=''
22-
KERNEL_DIR=private/msm-google
23-
POST_DEFCONFIG_CMDS="update_debug_config"
24-
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
25-
LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
26-
LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
27-
DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
28-
LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
29-
FILES="
30-
arch/arm64/boot/dtbo.img
31-
arch/arm64/boot/Image.gz-dtb
32-
vmlinux
33-
System.map
34-
"
35-
IN_KERNEL_MODULES=1

‎build.config.debug_hang

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
KERNEL_DIR=private/msm-google
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
3+
POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
4+
15
function update_debug_config() {
26
${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
37
-e CONFIG_LOCKUP_DETECTOR \
@@ -14,24 +18,3 @@ function update_debug_config() {
1418
(cd ${OUT_DIR} && \
1519
make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
1620
}
17-
18-
ARCH=arm64
19-
BRANCH=android-msm-wahoo-4.4
20-
CROSS_COMPILE=aarch64-linux-android-
21-
CROSS_COMPILE_ARM32=arm-linux-androideabi-
22-
DEFCONFIG=wahoo_defconfig
23-
EXTRA_CMDS=''
24-
KERNEL_DIR=private/msm-google
25-
POST_DEFCONFIG_CMDS="update_debug_config"
26-
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
27-
LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
28-
LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
29-
DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
30-
LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
31-
FILES="
32-
arch/arm64/boot/dtbo.img
33-
arch/arm64/boot/Image.gz-dtb
34-
vmlinux
35-
System.map
36-
"
37-
IN_KERNEL_MODULES=1

‎build.config.debug_locking

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
KERNEL_DIR=private/msm-google
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
3+
POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
4+
15
function update_debug_config() {
26
${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
37
-e CONFIG_DEBUG_RT_MUTEXES \
@@ -10,24 +14,3 @@ function update_debug_config() {
1014
(cd ${OUT_DIR} && \
1115
make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
1216
}
13-
14-
ARCH=arm64
15-
BRANCH=android-msm-wahoo-4.4
16-
CROSS_COMPILE=aarch64-linux-android-
17-
CROSS_COMPILE_ARM32=arm-linux-androideabi-
18-
DEFCONFIG=wahoo_defconfig
19-
EXTRA_CMDS=''
20-
KERNEL_DIR=private/msm-google
21-
POST_DEFCONFIG_CMDS="update_debug_config"
22-
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
23-
LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
24-
LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
25-
DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
26-
LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
27-
FILES="
28-
arch/arm64/boot/dtbo.img
29-
arch/arm64/boot/Image.gz-dtb
30-
vmlinux
31-
System.map
32-
"
33-
IN_KERNEL_MODULES=1

‎build.config.debug_memory

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
KERNEL_DIR=private/msm-google
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
3+
POST_DEFCONFIG_CMDS="check_defconfig && update_debug_config"
4+
15
function update_debug_config() {
26
${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
37
-e CONFIG_DEBUG_OBJECTS \
@@ -18,24 +22,3 @@ function update_debug_config() {
1822
(cd ${OUT_DIR} && \
1923
make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
2024
}
21-
22-
ARCH=arm64
23-
BRANCH=android-msm-wahoo-4.4
24-
CROSS_COMPILE=aarch64-linux-android-
25-
CROSS_COMPILE_ARM32=arm-linux-androideabi-
26-
DEFCONFIG=wahoo_defconfig
27-
EXTRA_CMDS=''
28-
KERNEL_DIR=private/msm-google
29-
POST_DEFCONFIG_CMDS="update_debug_config"
30-
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
31-
LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
32-
LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
33-
DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
34-
LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
35-
FILES="
36-
arch/arm64/boot/dtbo.img
37-
arch/arm64/boot/Image.gz-dtb
38-
vmlinux
39-
System.map
40-
"
41-
IN_KERNEL_MODULES=1

‎build.config.gcc

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
ARCH=arm64
2-
BRANCH=android-msm-wahoo-4.4
3-
CROSS_COMPILE=aarch64-linux-android-
4-
CROSS_COMPILE_ARM32=arm-linux-androideabi-
5-
DEFCONFIG=wahoo_defconfig
6-
EXTRA_CMDS=''
71
KERNEL_DIR=private/msm-google
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
83
POST_DEFCONFIG_CMDS="check_defconfig"
9-
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
10-
LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
11-
LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
12-
DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
13-
LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
14-
FILES="
15-
arch/arm64/boot/dtbo.img
16-
arch/arm64/boot/Image.lz4-dtb
17-
vmlinux
18-
System.map
19-
"
20-
IN_KERNEL_MODULES=1

‎build.config.kasan

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
KERNEL_DIR=private/msm-google
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
3+
POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config"
4+
15
function update_kasan_config() {
26
${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
37
-e CONFIG_KASAN \
@@ -14,24 +18,3 @@ function update_kasan_config() {
1418
(cd ${OUT_DIR} && \
1519
make O=${OUT_DIR} $archsubarch CROSS_COMPILE=${CROSS_COMPILE} olddefconfig)
1620
}
17-
18-
ARCH=arm64
19-
BRANCH=android-msm-wahoo-4.4
20-
CROSS_COMPILE=aarch64-linux-android-
21-
CROSS_COMPILE_ARM32=arm-linux-androideabi-
22-
DEFCONFIG=wahoo_defconfig
23-
EXTRA_CMDS=''
24-
KERNEL_DIR=private/msm-google
25-
POST_DEFCONFIG_CMDS="update_kasan_config"
26-
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
27-
LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
28-
LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
29-
DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
30-
LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
31-
FILES="
32-
arch/arm64/boot/dtbo.img
33-
arch/arm64/boot/Image.gz-dtb
34-
vmlinux
35-
System.map
36-
"
37-
IN_KERNEL_MODULES=1

‎build.config.lts

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
KERNEL_DIR=private/msm-google
2+
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common.clang
3+
PRE_DEFCONFIG_CMDS="pre_defconfig"
4+
POST_DEFCONFIG_CMDS="check_defconfig"
5+
POST_KERNEL_BUILD_CMDS="post_kernel_build"
6+
17
function pre_defconfig() {
28
# Watch KERNEL_DIR recursively, record all files opened during the build
39
rm -f ${OUT_DIR}/kernel-files.tmp1
@@ -14,33 +20,3 @@ function post_kernel_build() {
1420
(set +x; for f in $(cat ${OUT_DIR}/kernel-files.tmp2); do [ -f "${KERNEL_DIR}/${f}" ] && echo "${f}"; done > ${OUT_DIR}/kernel-files.txt)
1521
(cd ${KERNEL_DIR} && ${ROOT_DIR}/build/buildinfo/generate-merge-commit-msg.py HEAD~1..HEAD ${OUT_DIR}/kernel-files.txt > ${OUT_DIR}/merge-commit-msg.txt)
1622
}
17-
18-
ARCH=arm64
19-
BRANCH=android-msm-wahoo-4.4
20-
CC=clang
21-
CLANG_TRIPLE=aarch64-linux-gnu-
22-
CROSS_COMPILE=aarch64-linux-android-
23-
CROSS_COMPILE_ARM32=arm-linux-androideabi-
24-
DEFCONFIG=wahoo_defconfig
25-
EXTRA_CMDS=''
26-
KERNEL_DIR=private/msm-google
27-
PRE_DEFCONFIG_CMDS="pre_defconfig"
28-
POST_DEFCONFIG_CMDS='check_defconfig'
29-
POST_KERNEL_BUILD_CMDS="post_kernel_build"
30-
CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r346389b/bin/
31-
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin
32-
LINUX_GCC_CROSS_COMPILE_ARM32_PREBUILTS_BIN=prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
33-
LZ4_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/lz4
34-
DTC_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/dtc
35-
LIBUFDT_PREBUILTS_BIN=prebuilts-master/misc/linux-x86/libufdt
36-
FILES="
37-
arch/arm64/boot/dtbo.img
38-
arch/arm64/boot/Image.lz4-dtb
39-
vmlinux
40-
System.map
41-
"
42-
IN_KERNEL_MODULES=1
43-
STOP_SHIP_TRACEPRINTK=1
44-
UNSTRIPPED_MODULES="
45-
wlan.ko
46-
"

0 commit comments

Comments
 (0)