Revert "Temporarily use blockimgdiff v2 for OTA."
This reverts commit d07bfc519673fdba66448f0a81ef869b922c3804.
Real fixes [1][2][3] are ready to merge. Time to revert the workaround.
[1] commit d47d8e14880132c42a75f41c8041851797c75e35
[2] commit 1fc67631eedbfba07e005d85aadae6e1b91d8d93
[3] commit 937847ae493d36b9741f6387a2357d5cdceda3d9
Bug: 22430577
Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
diff --git a/core/Makefile b/core/Makefile
index 888d01f..07d1c94 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1510,7 +1510,7 @@
$(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt
$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt
$(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt
- $(hide) echo "blockimgdiff_versions=1,2" >> $(zip_root)/META/misc_info.txt
+ $(hide) echo "blockimgdiff_versions=1,2,3" >> $(zip_root)/META/misc_info.txt
ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
# OTA scripts are only interested in fingerprint related properties
$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt