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

Commit 7bd9061f authored by Todd Kjos's avatar Todd Kjos Committed by Will Mcvicker
Browse files

ANDROID: gki_defconfig: add FORTIFY_SOURCE, remove SPMI_MSM_PMIC_ARB 



Force SPMI_MSM_PMIC_ARB off and enable FORTIFY_SOURCE for GKI

Bug: 142896904
Bug: 134087016
Test: Build/Boot on cuttlefish
Change-Id: Ib6e501f1efee2349d750010a53572dddcb5457c5
Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
(cherry picked from 6f2fe74a1b296286a65547150b733dc36837fd8d)
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
parent 3e86e81f

arch/arm64/configs/gki_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ CONFIG_I2C_CHARDEV=y 
# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_SPI=y

CONFIG_SPMI=y

# CONFIG_SPMI_MSM_PMIC_ARB is not set

CONFIG_PINCTRL_AMD=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_AVS=y
@@ -478,6 +479,7 @@ CONFIG_SECURITY=y 
CONFIG_SECURITYFS=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_SECURITY_SELINUX=y

CONFIG_INIT_STACK_ALL=y

CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y

arch/x86/configs/gki_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ CONFIG_SECURITY=y 
CONFIG_SECURITYFS=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_SECURITY_SELINUX=y

CONFIG_INIT_STACK_ALL=y

CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y