From 5b27184f3bc1c25ddd656229c793c11fee61141b Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 10 Oct 2019 15:45:41 -0700 Subject: [PATCH] ANDROID: gki_defconfig: enable fs-verity fs-verity will be used for APK verification in R. Bug: 142494008 Change-Id: Ia18eb35fcdbccabab47de5fb26daba455fc1eb77 Signed-off-by: Eric Biggers --- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 47b1d3a24418..5051c93ddc64 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -380,6 +380,8 @@ CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y CONFIG_F2FS_FS_SECURITY=y CONFIG_FS_ENCRYPTION=y +CONFIG_FS_VERITY=y +CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y # CONFIG_DNOTIFY is not set CONFIG_QUOTA=y CONFIG_QFMT_V2=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index d3608c2f5a4e..be38bd45f8d7 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -318,6 +318,8 @@ CONFIG_EXT4_ENCRYPTION=y CONFIG_F2FS_FS=y CONFIG_F2FS_FS_SECURITY=y CONFIG_F2FS_FS_ENCRYPTION=y +CONFIG_FS_VERITY=y +CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y # CONFIG_DNOTIFY is not set CONFIG_QUOTA=y CONFIG_QFMT_V2=y