Require FS_ENCRYPTION on R-launched devices
The CDD requires file-based encryption on all devices launched with Q or higher. Also, in android-4.14 and later the filesystem-specific kconfig options CONFIG_EXT4_ENCRYPTION and CONFIG_F2FS_FS_ENCRYPTION have been replaced with a single option CONFIG_FS_ENCRYPTION. (In android-4.14 and android-4.19 the old names are still allowed for compatibility, but both just select CONFIG_FS_ENCRYPTION.) Thus, start requiring CONFIG_FS_ENCRYPTION=y. Bug: 150245658 Test: Treehugger Change-Id: Ia08ce7adadf3f32d27e565f5be54085bf9c711ee Merged-In: Ia08ce7adadf3f32d27e565f5be54085bf9c711ee
This commit is contained in:
parent
05250565e4
commit
f6eca1a41a
6 changed files with 3 additions and 5 deletions
|
@ -50,6 +50,7 @@ CONFIG_EMBEDDED=y
|
|||
CONFIG_EPOLL=y
|
||||
CONFIG_EVENTFD=y
|
||||
CONFIG_FILE_LOCKING=y
|
||||
CONFIG_FS_ENCRYPTION=y
|
||||
CONFIG_FUSE_FS=y
|
||||
CONFIG_FUTEX=y
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
|
|
|
@ -22,11 +22,9 @@ CONFIG_DM_VERITY_FEC=y
|
|||
CONFIG_DRAGONRISE_FF=y
|
||||
CONFIG_ELF_CORE=y
|
||||
CONFIG_ENABLE_DEFAULT_TRACERS=y
|
||||
CONFIG_EXT4_ENCRYPTION=y
|
||||
CONFIG_EXT4_FS=y
|
||||
CONFIG_EXT4_FS_SECURITY=y
|
||||
CONFIG_F2FS_FS=y
|
||||
CONFIG_F2FS_FS_ENCRYPTION=y
|
||||
CONFIG_F2FS_FS_SECURITY=y
|
||||
CONFIG_FTRACE=y
|
||||
CONFIG_GREENASIA_FF=y
|
||||
|
|
|
@ -50,6 +50,7 @@ CONFIG_EMBEDDED=y
|
|||
CONFIG_EPOLL=y
|
||||
CONFIG_EVENTFD=y
|
||||
CONFIG_FILE_LOCKING=y
|
||||
CONFIG_FS_ENCRYPTION=y
|
||||
CONFIG_FUSE_FS=y
|
||||
CONFIG_FUTEX=y
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
|
|
|
@ -22,11 +22,9 @@ CONFIG_DRAGONRISE_FF=y
|
|||
CONFIG_ELF_CORE=y
|
||||
CONFIG_ENABLE_DEFAULT_TRACERS=y
|
||||
CONFIG_ENERGY_MODEL=y
|
||||
CONFIG_EXT4_ENCRYPTION=y
|
||||
CONFIG_EXT4_FS=y
|
||||
CONFIG_EXT4_FS_SECURITY=y
|
||||
CONFIG_F2FS_FS=y
|
||||
CONFIG_F2FS_FS_ENCRYPTION=y
|
||||
CONFIG_F2FS_FS_SECURITY=y
|
||||
CONFIG_FTRACE=y
|
||||
CONFIG_GREENASIA_FF=y
|
||||
|
|
|
@ -50,6 +50,7 @@ CONFIG_EMBEDDED=y
|
|||
CONFIG_EPOLL=y
|
||||
CONFIG_EVENTFD=y
|
||||
CONFIG_FILE_LOCKING=y
|
||||
CONFIG_FS_ENCRYPTION=y
|
||||
CONFIG_FUSE_FS=y
|
||||
CONFIG_FUTEX=y
|
||||
CONFIG_HARDENED_USERCOPY=y
|
||||
|
|
|
@ -26,7 +26,6 @@ CONFIG_EXT4_FS=y
|
|||
CONFIG_EXT4_FS_SECURITY=y
|
||||
CONFIG_F2FS_FS=y
|
||||
CONFIG_F2FS_FS_SECURITY=y
|
||||
CONFIG_FS_ENCRYPTION=y
|
||||
CONFIG_FTRACE=y
|
||||
CONFIG_GREENASIA_FF=y
|
||||
CONFIG_HIDRAW=y
|
||||
|
|
Loading…
Reference in a new issue