ANDROID: verity: really fix android-verity Kconfig
The change "ANDROID: verity: fix android-verity Kconfig dependencies"
relaxed the dependency on DM_VERITY=y to just DM_VERITY, but this is not
correct because there are parts of the verity and dm-mod API that
android-verity is using but which are not exported to modules.
Work around this problem by disallowing android-verity to be built-in
when the dm/verity core is built modularly.
Bug: 72722987
Change-Id: I3cfaa2acca8e4a4b5c459afdddd958ac9f8c1eb3
Signed-off-by: Alistair Strachan <astrachan@google.com>
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 199c02b..c786f6b 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -518,8 +518,8 @@
config DM_ANDROID_VERITY
bool "Android verity target support"
- depends on BLK_DEV_DM
- depends on DM_VERITY
+ depends on BLK_DEV_DM=y
+ depends on DM_VERITY=y
depends on X509_CERTIFICATE_PARSER
depends on SYSTEM_TRUSTED_KEYRING
depends on CRYPTO_RSA