aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2023-07-18 21:26:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-07-18 21:26:02 +0000
commit8e69d50ac7a20950ff8504e69cacb013941f3a40 (patch)
tree8b0e6969fa754ea29a654f14cb4e1039be9294c9
parent753a88ad3f16df89685e08b4b332a803b6b9c163 (diff)
parentfbbb801e83f6f9171fab7e8532b3c1aba211f680 (diff)
downloadconfigs-8e69d50ac7a20950ff8504e69cacb013941f3a40.tar.gz
Stop requiring CONFIG_FS_VERITY_BUILTIN_SIGNATURES am: 07e726fb7d am: 39d84faf16 am: 2faf0518c9 am: 7e2a394022 am: fbbb801e83
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2650402 Change-Id: I7d1de392691eba15ff29289f4692d29b0b4e1027 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--v/android-5.15/android-base.config1
-rw-r--r--v/android-6.1/android-base.config1
2 files changed, 0 insertions, 2 deletions
diff --git a/v/android-5.15/android-base.config b/v/android-5.15/android-base.config
index d7459d6..0b099b3 100644
--- a/v/android-5.15/android-base.config
+++ b/v/android-5.15/android-base.config
@@ -67,7 +67,6 @@ CONFIG_FILE_LOCKING=y
CONFIG_FS_ENCRYPTION=y
CONFIG_FS_ENCRYPTION_INLINE_CRYPT=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/v/android-6.1/android-base.config b/v/android-6.1/android-base.config
index 2dbcfab..e9c7420 100644
--- a/v/android-6.1/android-base.config
+++ b/v/android-6.1/android-base.config
@@ -66,7 +66,6 @@ CONFIG_FILE_LOCKING=y
CONFIG_FS_ENCRYPTION=y
CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
CONFIG_FS_VERITY=y
-CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
CONFIG_FUSE_FS=y
CONFIG_FUTEX=y
CONFIG_HARDENED_USERCOPY=y