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

Commit 16c10a35 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix: Move COMPRESSION_COMMAND_DEPS before first use" into main am: 0f4d35dd am: 371d7536 

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



Change-Id: Ia054d340351ad6b6805aefa6905aac2b090ae2c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bdd632c 371d7536

core/Makefile

+10 −11
Original line number Diff line number Diff line
@@ -1075,6 +1075,16 @@ $(eval $(call declare-0p-target,$(INSTALLED_FILES_JSON_RAMDISK))) 


BUILT_RAMDISK_TARGET := $(PRODUCT_OUT)/ramdisk.img



ifeq ($(BOARD_RAMDISK_USE_LZ4),true)

# -l enables the legacy format used by the Linux kernel

COMPRESSION_COMMAND_DEPS := $(LZ4)

COMPRESSION_COMMAND := $(LZ4) -l -12 --favor-decSpeed

RAMDISK_EXT := .lz4

else

COMPRESSION_COMMAND_DEPS := $(GZIP)

COMPRESSION_COMMAND := $(GZIP)

RAMDISK_EXT := .gz

endif



ifneq ($(BOARD_KERNEL_MODULES_16K),)
@@ -1257,17 +1267,6 @@ boototapackage_16k: $(BUILT_BOOT_OTA_PACKAGE_16K) 
endif





ifeq ($(BOARD_RAMDISK_USE_LZ4),true)

# -l enables the legacy format used by the Linux kernel

COMPRESSION_COMMAND_DEPS := $(LZ4)

COMPRESSION_COMMAND := $(LZ4) -l -12 --favor-decSpeed

RAMDISK_EXT := .lz4

else

COMPRESSION_COMMAND_DEPS := $(GZIP)

COMPRESSION_COMMAND := $(GZIP)

RAMDISK_EXT := .gz

endif



# This file contains /dev nodes description added to the generic ramdisk

RAMDISK_NODE_LIST := $(PRODUCT_OUT)/ramdisk_node_list