Merge "Generate brotli compressed {}.new.dat for full OTA" am: 1b28eca1a1 (4b53a177) · Commits · e / os / android_build

core/Makefile

+7 −2

Original line number	Diff line number	Diff line
		@@ -2088,7 +2088,8 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
		$(HOST_OUT_EXECUTABLES)/lib/shflags/shflags \
		$(HOST_OUT_EXECUTABLES)/delta_generator \
		$(AVBTOOL) \
		$(BLK_ALLOC_TO_BASE_FS)
		$(BLK_ALLOC_TO_BASE_FS) \
		$(BRO)

		ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))
		OTATOOLS += \
		@@ -2122,7 +2123,9 @@ OTATOOLS += \
		$(HOST_LIBRARY_PATH)/libz-host$(HOST_SHLIB_SUFFIX) \
		$(HOST_LIBRARY_PATH)/libsparse-host$(HOST_SHLIB_SUFFIX) \
		$(HOST_LIBRARY_PATH)/libbase$(HOST_SHLIB_SUFFIX) \
		$(HOST_LIBRARY_PATH)/libpcre2$(HOST_SHLIB_SUFFIX)
		$(HOST_LIBRARY_PATH)/libpcre2$(HOST_SHLIB_SUFFIX) \
		$(HOST_LIBRARY_PATH)/libbrotli$(HOST_SHLIB_SUFFIX)


		.PHONY: otatools
		otatools: $(OTATOOLS)
		@@ -2571,6 +2574,8 @@ $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)

		ifeq ($(AB_OTA_UPDATER),true)
		$(INTERNAL_OTA_PACKAGE_TARGET): $(BRILLO_UPDATE_PAYLOAD)
		else
		$(INTERNAL_OTA_PACKAGE_TARGET): $(BRO)
		endif

		$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) \

core/config.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -592,6 +592,7 @@ NANOPB_SRCS := external/nanopb-c/generator/protoc-gen-nanopb \
		VTSC := $(HOST_OUT_EXECUTABLES)/vtsc$(HOST_EXECUTABLE_SUFFIX)
		MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX)
		MINIGZIP := $(HOST_OUT_EXECUTABLES)/minigzip$(HOST_EXECUTABLE_SUFFIX)
		BRO := $(HOST_OUT_EXECUTABLES)/bro$(HOST_EXECUTABLE_SUFFIX)
		ifeq (,$(strip $(BOARD_CUSTOM_MKBOOTIMG)))
		MKBOOTIMG := $(HOST_OUT_EXECUTABLES)/mkbootimg$(HOST_EXECUTABLE_SUFFIX)
		else

tools/releasetools/common.py

+31 −5

Original line number	Diff line number	Diff line
		@@ -1515,9 +1515,34 @@ class BlockDifference(object):
		ZipWrite(output_zip,
		'{}.transfer.list'.format(self.path),
		'{}.transfer.list'.format(self.partition))

		# For full OTA, compress the new.dat with brotli with quality 6 to reduce its size. Quailty 9
		# almost triples the compression time but doesn't further reduce the size too much.
		# For a typical 1.8G system.new.dat
		# zip \| brotli(quality 6) \| brotli(quality 9)
		# compressed_size: 942M \| 869M (~8% reduced) \| 854M
		# compression_time: 75s \| 265s \| 719s
		# decompression_time: 15s \| 25s \| 25s

		if not self.src:
		bro_cmd = ['bro', '--quality', '6',
		'--input', '{}.new.dat'.format(self.path),
		'--output', '{}.new.dat.br'.format(self.path)]
		print("Compressing {}.new.dat with brotli".format(self.partition))
		p = Run(bro_cmd, stdout=subprocess.PIPE)
		p.communicate()
		assert p.returncode == 0,\
		'compression of {}.new.dat failed'.format(self.partition)

		new_data_name = '{}.new.dat.br'.format(self.partition)
		ZipWrite(output_zip,
		'{}.new.dat'.format(self.path),
		'{}.new.dat'.format(self.partition))
		'{}.new.dat.br'.format(self.path),
		new_data_name,
		compress_type=zipfile.ZIP_STORED)
		else:
		new_data_name = '{}.new.dat'.format(self.partition)
		ZipWrite(output_zip, '{}.new.dat'.format(self.path), new_data_name)

		ZipWrite(output_zip,
		'{}.patch.dat'.format(self.path),
		'{}.patch.dat'.format(self.partition),
		@@ -1530,9 +1555,10 @@ class BlockDifference(object):

		call = ('block_image_update("{device}", '
		'package_extract_file("{partition}.transfer.list"), '
		'"{partition}.new.dat", "{partition}.patch.dat") \|\|\n'
		'"{new_data_name}", "{partition}.patch.dat") \|\|\n'
		' abort("E{code}: Failed to update {partition} image.");'.format(
		device=self.device, partition=self.partition, code=code))
		device=self.device, partition=self.partition,
		new_data_name=new_data_name, code=code))
		script.AppendExtra(script.WordWrap(call))

		def _HashBlocks(self, source, ranges): # pylint: disable=no-self-use