commit 07e726fb7d0dc50ba6d8dcbbbe8def8d5ee9c573
author Eric Biggers <ebiggers@google.com> Thu Jul 06 18:06:21 2023 +0000
committer Eric Biggers <ebiggers@google.com> Mon Jul 17 20:14:27 2023 +0000
tree 8b0e6969fa754ea29a654f14cb4e1039be9294c9
parent fdfede030ebb86641450773aa9c1a04adedcb062

Stop requiring CONFIG_FS_VERITY_BUILTIN_SIGNATURES

Android no longer uses fsverity builtin signatures, so stop requiring
CONFIG_FS_VERITY_BUILTIN_SIGNATURES.

Bug: 290060816
Test: presubmit
Change-Id: Icd324d1dcc536d3428b0013e5e40ceb910894684

v/android-5.15/android-base.config

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_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

v/android-6.1/android-base.config

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_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