diff options
| author | Tao Bao <tbao@google.com> | 2015-10-21 13:30:43 -0700 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2015-10-23 10:45:36 -0700 |
| commit | eba409c4da654fc9c0e26119c697be4e85bf1611 (patch) | |
| tree | 103d9e3da30d2d791c39145f24212e62df0afcaf | |
| parent | c82b873b9b6c234da128cdbc0dde6624e45f5b6d (diff) | |
| download | build-eba409c4da654fc9c0e26119c697be4e85bf1611.tar.gz | |
Bump up the BBOTA version to 4.
To accommodate new changes (such as error correction in [1]) to BBOTA
in N release. We bump up the version to keep the OTA script backward
compatible.
Needs the matching CL in commit
1fdec8685af858c5ff4f45d2e3059186ab5ed2ab.
[1]: commit 0a7b47397db3648afe6f3aeb2abb175934c2cbca
Change-Id: Ib9158b455cd5905fe2d4742ce81feb1b7583054f
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | tools/releasetools/blockimgdiff.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/Makefile b/core/Makefile index 055372fb1a..db568d069d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1588,7 +1588,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,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 882cc872d1..1a5b93d321 100644 --- a/tools/releasetools/blockimgdiff.py +++ b/tools/releasetools/blockimgdiff.py @@ -241,7 +241,7 @@ class Transfer(object): # 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 @@ class BlockImageDiff(object): 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: |