summaryrefslogtreecommitdiffstats
path: root/core/Makefile
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-08-26 15:28:35 -0700
committerTao Bao <tbao@google.com>2015-08-26 15:29:00 -0700
commit7540c0880723488b3ce5c7149c5760cb382794e6 (patch)
tree48161395804d8612396ca62dc7ec2abd268b0e1f /core/Makefile
parent8a1fa15844e0ad73d3b327ff567012e485e7896d (diff)
downloadbuild-7540c0880723488b3ce5c7149c5760cb382794e6.zip
build-7540c0880723488b3ce5c7149c5760cb382794e6.tar.gz
build-7540c0880723488b3ce5c7149c5760cb382794e6.tar.bz2
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
Diffstat (limited to 'core/Makefile')
-rw-r--r--core/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile
index 888d01f..07d1c94 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -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