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

Commit 0fb9e3f9 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Switch from minigzip to gzip." into main am: c1577ff5 am: f94ff914... 

Merge "Switch from minigzip to gzip." into main am: c1577ff5 am: f94ff914 am: d9cdcba9 am: 7a75419a am: 30376cd6

Original change: https://android-review.googlesource.com/c/platform/build/+/2632009



Change-Id: I41c1e36baf0d01ee6d0d9a768ce2a06c361427a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c1f632c 30376cd6

core/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -1045,8 +1045,8 @@ COMPRESSION_COMMAND_DEPS := $(LZ4) 
COMPRESSION_COMMAND := $(LZ4) -l -12 --favor-decSpeed

RAMDISK_EXT := .lz4

else

COMPRESSION_COMMAND_DEPS := $(MINIGZIP)

COMPRESSION_COMMAND := $(MINIGZIP)

COMPRESSION_COMMAND_DEPS := $(GZIP)

COMPRESSION_COMMAND := $(GZIP)

RAMDISK_EXT := .gz

endif
@@ -5262,7 +5262,6 @@ INTERNAL_OTATOOLS_MODULES := \ 
  make_f2fs_casefold \

  merge_ota \

  merge_target_files \

  minigzip \

  mk_combined_img \

  mkbootfs \

  mkbootimg \

core/app_prebuilt_internal.mk

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ endif 
$(built_module): PRIVATE_EMBEDDED_JNI_LIBS := $(embedded_prebuilt_jni_libs)



ifdef LOCAL_COMPRESSED_MODULE

$(built_module) : $(MINIGZIP)

$(built_module) : $(GZIP)

endif



ifeq ($(module_run_appcompat),true)

core/config.mk

+2 −1
Original line number Diff line number Diff line
@@ -645,10 +645,11 @@ else 
# For non-supported hosts, do not generate breakpad symbols.

BREAKPAD_GENERATE_SYMBOLS := false

endif

GZIP := prebuilts/build-tools/path/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/gzip

PROTOC := $(HOST_OUT_EXECUTABLES)/aprotoc$(HOST_EXECUTABLE_SUFFIX)

NANOPB_SRCS := $(HOST_OUT_EXECUTABLES)/protoc-gen-nanopb

MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX)

MINIGZIP := $(HOST_OUT_EXECUTABLES)/minigzip$(HOST_EXECUTABLE_SUFFIX)

MINIGZIP := $(GZIP)

LZ4 := $(HOST_OUT_EXECUTABLES)/lz4$(HOST_EXECUTABLE_SUFFIX)

GENERATE_GKI_CERTIFICATE := $(HOST_OUT_EXECUTABLES)/generate_gki_certificate$(HOST_EXECUTABLE_SUFFIX)

ifeq (,$(strip $(BOARD_CUSTOM_MKBOOTIMG)))

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2941,7 +2941,7 @@ endef 
define compress-package

$(hide) \

  mv $@ $@.uncompressed; \

  $(MINIGZIP) -9 -c $@.uncompressed > $@.compressed; \

  $(GZIP) -9 -c $@.uncompressed > $@.compressed; \

  rm -f $@.uncompressed; \

  mv $@.compressed $@;

endef

core/package_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ $(LOCAL_BUILT_MODULE) : $(JAR_ARGS) $(SOONG_ZIP) $(MERGE_ZIPS) $(ZIP2ZIP) 
$(LOCAL_BUILT_MODULE): PRIVATE_RES_PACKAGE := $(my_res_package)

$(LOCAL_BUILT_MODULE) : $(my_res_package) $(AAPT2)

ifdef LOCAL_COMPRESSED_MODULE

$(LOCAL_BUILT_MODULE) : $(MINIGZIP)

$(LOCAL_BUILT_MODULE) : $(GZIP)

endif

ifeq (true, $(LOCAL_UNCOMPRESS_DEX))

$(LOCAL_BUILT_MODULE) : $(ZIP2ZIP)