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

Commit ac4ec1a4 authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "Bump up the BBOTA version to 4."

parents 47e46f77 eba409c4

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: