commit 4a07d423aadfcb83525fd56c395d4a26bd4f3c54
author hungweichen <hungweichen@google.com> Fri Aug 05 06:04:05 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 05 06:04:05 2022 +0000
tree e0b753256014ac35668cda0b58fd01ac7fa6db56
parent 9a3b0b8b2ed4af1d9501e5f24d54e355a82b1fdf
parent 3b6447183777c524c9c4a87173bc69faf2c1fac0

Remove AVB 1.0 configs for dm-verity am: f3866eeaa6 am: cd2a71dcc5 am: 05352582f0 am: 3b64471837

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2173783

Change-Id: Ie8f9b04160d9b94ccb15a25047e51a390cea6513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

hikey.mk

diff --git a/hikey.mk b/hikey.mk
index f869c71..a5ff4aa 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -3,13 +3,6 @@
 $(call inherit-product, device/linaro/hikey/hikey-common.mk)
 $(call inherit-product-if-exists, vendor/linaro/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/hikey.mk)
 
-#setup dm-verity configs
-PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/platform/soc/f723d000.dwmmc0/by-name/system
-PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/platform/soc/f723d000.dwmmc0/by-name/vendor
-$(call inherit-product, build/target/product/verity.mk)
-PRODUCT_SUPPORTS_BOOT_SIGNER := false
-PRODUCT_SUPPORTS_VERITY_FEC := false
-
 PRODUCT_PROPERTY_OVERRIDES += ro.opengles.version=131072
 
 PRODUCT_NAME := hikey