am ccad82c5: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev

* commit 'ccad82c52e7c37c70fce579cf14377a88b885ae4':
  Revert "Temporarily use blockimgdiff v2 for OTA."
This commit is contained in:
Tao Bao 2015-09-01 19:10:11 +00:00 committed by Android Git Automerger
commit a125075a5f

View file

@ -1510,7 +1510,7 @@ endif
$(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