commit | 11010350d8527ee3dd04f21e9909e3700a1cd1bc | [log] [tgz] |
---|---|---|
author | Victor Hsieh <victorhsieh@google.com> | Mon Mar 02 15:27:02 2020 -0800 |
committer | Victor Hsieh <victorhsieh@google.com> | Tue Mar 03 09:10:06 2020 -0800 |
tree | ea78c9111056c53123b39cb9f15523967f51c4b0 | |
parent | f5591f5e9e7bc4d7984696055955653373e9b48a [diff] |
Require fs-verity and built-in signature support Test: Treehugger Bug: 133451372 Change-Id: I44a4b765918daef336b10f35c6d627bd7c06fbba Merged-In: I44a4b765918daef336b10f35c6d627bd7c06fbba
diff --git a/android-4.14/android-base.config b/android-4.14/android-base.config index 45203d7..9985819 100644 --- a/android-4.14/android-base.config +++ b/android-4.14/android-base.config
@@ -53,6 +53,8 @@ CONFIG_EVENTFD=y CONFIG_FILE_LOCKING=y CONFIG_FS_ENCRYPTION=y +CONFIG_FS_VERITY=y +CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y CONFIG_FUSE_FS=y CONFIG_FUTEX=y CONFIG_HARDENED_USERCOPY=y
diff --git a/android-4.19/android-base.config b/android-4.19/android-base.config index 58147e3..1ea979c 100644 --- a/android-4.19/android-base.config +++ b/android-4.19/android-base.config
@@ -53,6 +53,8 @@ CONFIG_EVENTFD=y CONFIG_FILE_LOCKING=y CONFIG_FS_ENCRYPTION=y +CONFIG_FS_VERITY=y +CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y CONFIG_FUSE_FS=y CONFIG_FUTEX=y CONFIG_HARDENED_USERCOPY=y
diff --git a/android-5.4/android-base.config b/android-5.4/android-base.config index 0ded73f..78653c8 100644 --- a/android-5.4/android-base.config +++ b/android-5.4/android-base.config
@@ -53,6 +53,8 @@ CONFIG_EVENTFD=y CONFIG_FILE_LOCKING=y CONFIG_FS_ENCRYPTION=y +CONFIG_FS_VERITY=y +CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y CONFIG_FUSE_FS=y CONFIG_FUTEX=y CONFIG_HARDENED_USERCOPY=y