diff --git a/core/Makefile b/core/Makefile index f9f1f94e8c..5bc632220f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2120,7 +2120,7 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_EXECUTABLES)/delta_generator \ $(AVBTOOL) \ $(BLK_ALLOC_TO_BASE_FS) \ - $(BRO) + $(BROTLI) ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)) OTATOOLS += \ @@ -2607,7 +2607,7 @@ $(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) +$(INTERNAL_OTA_PACKAGE_TARGET): $(BROTLI) endif $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) \ diff --git a/core/config.mk b/core/config.mk index aaeda70df9..232f1d0579 100644 --- a/core/config.mk +++ b/core/config.mk @@ -601,7 +601,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) +BROTLI := $(HOST_OUT_EXECUTABLES)/brotli$(HOST_EXECUTABLE_SUFFIX) ifeq (,$(strip $(BOARD_CUSTOM_MKBOOTIMG))) MKBOOTIMG := $(HOST_OUT_EXECUTABLES)/mkbootimg$(HOST_EXECUTABLE_SUFFIX) else diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 97261255cf..d16f5ebff5 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1530,11 +1530,11 @@ class BlockDifference(object): # 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)] + brotli_cmd = ['brotli', '--quality=6', + '--output={}.new.dat.br'.format(self.path), + '{}.new.dat'.format(self.path)] print("Compressing {}.new.dat with brotli".format(self.partition)) - p = Run(bro_cmd, stdout=subprocess.PIPE) + p = Run(brotli_cmd, stdout=subprocess.PIPE) p.communicate() assert p.returncode == 0,\ 'compression of {}.new.dat failed'.format(self.partition)