Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eba409c4 authored by Tao Bao's avatar Tao Bao
Browse files

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
parent c82b873b

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

tools/releasetools/blockimgdiff.py

+2 −2
Original line number Diff line number Diff line
@@ -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: