From 84e816e75331b2d834517e06e53cd337263ef8f2 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Mon, 15 Jun 2020 22:06:36 +0200 Subject: [PATCH] ANDROID: GKI: enable CONFIG_EXT4_FS_POSIX_ACL. This is required on devices without sdcardfs. Bug: 158733532 Bug: 161415296 Test: manual Change-Id: I21d6ee488b7e4a094260cffc654a4c9dc3392081 Signed-off-by: Martijn Coenen (cherry picked from commit 2f8b07b33144e9a831baa69f1df7b7eb8ea52aad) Signed-off-by: Will McVicker --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index a1eb8853325d..a715d2dcba9d 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -413,6 +413,7 @@ CONFIG_ANDROID_BINDERFS=y CONFIG_LIBNVDIMM=y # CONFIG_ND_BLK is not set CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y CONFIG_F2FS_FS_SECURITY=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index ac1b218572dd..9d12142293a9 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -343,6 +343,7 @@ CONFIG_ANDROID_BINDERFS=y CONFIG_LIBNVDIMM=y # CONFIG_ND_BLK is not set CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_ENCRYPTION=y CONFIG_F2FS_FS=y