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

Commit cbb4ec6c authored by Alex Deymo's avatar Alex Deymo Committed by Gerrit Code Review
Browse files

Merge "Update binary name to "brotli"."

parents 1f70f332 b10e07ae

core/Makefile

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

core/config.mk

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

tools/releasetools/common.py

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