summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTri Vo <trong@google.com>2019-05-13 15:03:32 -0700
committerAmit Pundir <amit.pundir@linaro.org>2019-09-16 13:09:02 +0530
commitcecf2103fddc4c9962cb7fde447155d7fc4a8642 (patch)
tree16ffe9068865b2b8cc01696f22b6cefb5cf09d2a /arch
parent5126a0c7c975c145a84c49b79a56ef35c0fe22da (diff)
ANDROID: cuttlefish_defconfig: Enable CONFIG_FS_ENCRYPTION
Android doesn't boot without per-file encryption. Bug: 129946805 Test: boot arm64 cuttlefish Signed-off-by: Tri Vo <trong@google.com> Change-Id: I72d3659fa3d8732d524686a68c480222394d9cbf
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/configs/cuttlefish_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig
index 6e26435ca327..d9e750511279 100644
--- a/arch/arm64/configs/cuttlefish_defconfig
+++ b/arch/arm64/configs/cuttlefish_defconfig
@@ -402,10 +402,9 @@ CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_IPC=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
CONFIG_F2FS_FS=y
CONFIG_F2FS_FS_SECURITY=y
-CONFIG_F2FS_FS_ENCRYPTION=y
+CONFIG_FS_ENCRYPTION=y
# CONFIG_DNOTIFY is not set
CONFIG_QUOTA=y
CONFIG_QFMT_V2=y