Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b648bdda authored by Matthias Maennich's avatar Matthias Maennich Committed by Ram Muthiah
Browse files

ANDROID: refactor build.config files to remove duplication 



The build.config.* files largely contain duplicate information by their
nature. Reorganize them reduce duplication and to allow adding new
configurations without copying the definitions again.

Bug: 140224784
Change-Id: I6a3810a125b0ed48591690ca33bb5c02be58218a
Signed-off-by: default avatarMatthias Maennich <maennich@google.com>
(cherry picked from commit 7d642373db4c6c1c6ed8af02492047896beb4a47)
parent fd673e8f

build.config.aarch64

0 → 100644
+11 −0
Original line number Diff line number Diff line 
ARCH=arm64



CLANG_TRIPLE=aarch64-linux-gnu-

CROSS_COMPILE=aarch64-linux-androidkernel-

LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin



FILES="

arch/arm64/boot/Image.gz

vmlinux

System.map

"

build.config.common

0 → 100644
+9 −0
Original line number Diff line number Diff line 
BRANCH=android-4.19-q

KERNEL_DIR=common



CC=clang

CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin



EXTRA_CMDS=''

STOP_SHIP_TRACEPRINTK=1

LD=ld.lld

build.config.cuttlefish.aarch64

+3 −16
Original line number Diff line number Diff line 
ARCH=arm64

BRANCH=android-4.19

CC=clang

CLANG_TRIPLE=aarch64-linux-gnu-

CROSS_COMPILE=aarch64-linux-androidkernel-

. ${ROOT_DIR}/common/build.config.common

. ${ROOT_DIR}/common/build.config.aarch64



DEFCONFIG=cuttlefish_defconfig

EXTRA_CMDS=''

KERNEL_DIR=common

POST_DEFCONFIG_CMDS="check_defconfig"
 
CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin

LD=ld.lld

LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin

FILES="

arch/arm64/boot/Image.gz

vmlinux

System.map

"

STOP_SHIP_TRACEPRINTK=1

build.config.cuttlefish.x86_64

+3 −16
Original line number Diff line number Diff line 
ARCH=x86_64

BRANCH=android-4.19

CC=clang

CLANG_TRIPLE=x86_64-linux-gnu-

CROSS_COMPILE=x86_64-linux-androidkernel-

. ${ROOT_DIR}/common/build.config.common

. ${ROOT_DIR}/common/build.config.x86_64



DEFCONFIG=x86_64_cuttlefish_defconfig

EXTRA_CMDS=''

KERNEL_DIR=common

POST_DEFCONFIG_CMDS="check_defconfig"
 
CLANG_PREBUILT_BIN=prebuilts-master/clang/host/linux-x86/clang-r353983c/bin

LD=ld.lld

LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin

FILES="

arch/x86/boot/bzImage

vmlinux

System.map

"

STOP_SHIP_TRACEPRINTK=1

build.config.x86_64

0 → 100644
+11 −0
Original line number Diff line number Diff line 
ARCH=x86_64



CLANG_TRIPLE=x86_64-linux-gnu-

CROSS_COMPILE=x86_64-linux-androidkernel-

LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin



FILES="

arch/x86/boot/bzImage

vmlinux

System.map

"