tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Update binary name to "brotli"." am: cbb4ec6cf0

Browse source 
am: ea26c8104e

Change-Id: I330a67434c9d69c3c9d9aadae495e92d9788928c
This commit is contained in:
Alex Deymo 2017-11-13 22:58:16 +00:00 committed by android-build-merger
commit a1c5d47708
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/Makefile
View file

@ -2129,7 +2129,7 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
$(HOST_OUT_EXECUTABLES)/delta_generator \ $(HOST_OUT_EXECUTABLES)/delta_generator \
$(AVBTOOL) \ $(AVBTOOL) \
$(BLK_ALLOC_TO_BASE_FS) \ $(BLK_ALLOC_TO_BASE_FS) \
$(BRO) $(BROTLI)
ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)) ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))
OTATOOLS += \ OTATOOLS += \
@ -2625,7 +2625,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
ifeq ($(AB_OTA_UPDATER),true) ifeq ($(AB_OTA_UPDATER),true)
$(INTERNAL_OTA_PACKAGE_TARGET): $(BRILLO_UPDATE_PAYLOAD) $(INTERNAL_OTA_PACKAGE_TARGET): $(BRILLO_UPDATE_PAYLOAD)
else else
$(INTERNAL_OTA_PACKAGE_TARGET): $(BRO) $(INTERNAL_OTA_PACKAGE_TARGET): $(BROTLI)
endif endif
$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) \ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) \

2
core/config.mk
View file

@ -601,7 +601,7 @@ NANOPB_SRCS := external/nanopb-c/generator/protoc-gen-nanopb \
VTSC := $(HOST_OUT_EXECUTABLES)/vtsc$(HOST_EXECUTABLE_SUFFIX) VTSC := $(HOST_OUT_EXECUTABLES)/vtsc$(HOST_EXECUTABLE_SUFFIX)
MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX) MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX)
MINIGZIP := $(HOST_OUT_EXECUTABLES)/minigzip$(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))) ifeq (,$(strip $(BOARD_CUSTOM_MKBOOTIMG)))
MKBOOTIMG := $(HOST_OUT_EXECUTABLES)/mkbootimg$(HOST_EXECUTABLE_SUFFIX) MKBOOTIMG := $(HOST_OUT_EXECUTABLES)/mkbootimg$(HOST_EXECUTABLE_SUFFIX)
else else

8
tools/releasetools/common.py
View file

@ -1571,11 +1571,11 @@ class BlockDifference(object):
# decompression_time: 15s | 25s | 25s # decompression_time: 15s | 25s | 25s
if not self.src: if not self.src:
bro_cmd = ['bro', '--quality', '6', brotli_cmd = ['brotli', '--quality=6',
'--input', '{}.new.dat'.format(self.path), '--output={}.new.dat.br'.format(self.path),
'--output', '{}.new.dat.br'.format(self.path)] '{}.new.dat'.format(self.path)]
print("Compressing {}.new.dat with brotli".format(self.partition)) 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() p.communicate()
assert p.returncode == 0,\ assert p.returncode == 0,\
'compression of {}.new.dat failed'.format(self.partition) 'compression of {}.new.dat failed'.format(self.partition)