Merge "Bump up the BBOTA version to 4." am: ac4ec1a4ea am: ada3927e53
am: 5ddc4ac802
* commit '5ddc4ac8028e1bfdf0f2cb3ea6b80762c73cd281':
Bump up the BBOTA version to 4.
diff --git a/core/Makefile b/core/Makefile
index 4ace3d0..645f686 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1588,7 +1588,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,3" >> $(zip_root)/META/misc_info.txt
+ $(hide) echo "blockimgdiff_versions=1,2,3,4" >> $(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
diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py
index 882cc87..1a5b93d 100644
--- a/tools/releasetools/blockimgdiff.py
+++ b/tools/releasetools/blockimgdiff.py
@@ -241,7 +241,7 @@
# original image.
class BlockImageDiff(object):
- def __init__(self, tgt, src=None, threads=None, version=3):
+ def __init__(self, tgt, src=None, threads=None, version=4):
if threads is None:
threads = multiprocessing.cpu_count() // 2
if threads == 0:
@@ -252,7 +252,7 @@
self.src_basenames = {}
self.src_numpatterns = {}
- assert version in (1, 2, 3)
+ assert version in (1, 2, 3, 4)
self.tgt = tgt
if src is None: