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

Commit 3c7687a7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Move COMPRESSION_COMMAND_DEPS before first use"" into main am:... 

Merge "Revert "Move COMPRESSION_COMMAND_DEPS before first use"" into main am: d7d16e3c am: 975b2c63

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



Change-Id: Ib34c0c1c8f6908e0172344251352be09fc2319c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 232875fe 975b2c63

core/Makefile

+11 −12
Original line number Original line Diff line number Diff line
@@ -1126,18 +1126,6 @@ $(foreach \ 
  ) \

  ) \

)

)





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





BOARD_VENDOR_RAMDISK_FRAGMENT.16K.PREBUILT := $(BUILT_RAMDISK_16K_TARGET)

BOARD_VENDOR_RAMDISK_FRAGMENT.16K.PREBUILT := $(BUILT_RAMDISK_16K_TARGET)





ifndef BOARD_KERNEL_MODULES_LOAD_16K

ifndef BOARD_KERNEL_MODULES_LOAD_16K
@@ -1269,6 +1257,17 @@ boototapackage_16k: $(BUILT_BOOT_OTA_PACKAGE_16K) 
endif

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

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

RAMDISK_NODE_LIST := $(PRODUCT_OUT)/ramdisk_node_list

RAMDISK_NODE_LIST := $(PRODUCT_OUT)/ramdisk_node_list