Merge "Use platform built lz4 tool rather than system copy" into main am: 510e0f2cbd
am: 2a6a71476b
am: 8cf849c86c
am: cd19122a2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2724254 Change-Id: I11b709bfcaffbcda403de5eb1b035fd43666d352 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1075,8 +1075,8 @@ $(BUILT_RAMDISK_16K_TARGET): $(foreach file,$(BOARD_KERNEL_MODULES_16K),$(RAMDIS
|
||||
done;
|
||||
rm -rf $(TARGET_OUT_RAMDISK_16K)/lib/modules
|
||||
mkdir -p $(TARGET_OUT_RAMDISK_16K)/lib/modules
|
||||
KERNEL_RELEASE=`$(EXTRACT_KERNEL) --input $(BOARD_KERNEL_PATH_16K) --output-release /dev/stdout` ;\
|
||||
IS_16K_KERNEL=`$(EXTRACT_KERNEL) --input $(BOARD_KERNEL_PATH_16K) --output-config /dev/stdout` ;\
|
||||
KERNEL_RELEASE=`$(EXTRACT_KERNEL) --tools lz4:$(LZ4) --input $(BOARD_KERNEL_PATH_16K) --output-release` ;\
|
||||
IS_16K_KERNEL=`$(EXTRACT_KERNEL) --tools lz4:$(LZ4) --input $(BOARD_KERNEL_PATH_16K) --output-config` ;\
|
||||
if [[ "$$IS_16K_KERNEL" == *"CONFIG_ARM64_16K_PAGES=y"* ]]; then SUFFIX=_16k; fi ;\
|
||||
cp -r $(RAMDISK_16K_STAGING_DIR)/lib/modules/0.0 $(TARGET_OUT_RAMDISK_16K)/lib/modules/$$KERNEL_RELEASE$$SUFFIX
|
||||
$(MKBOOTFS) $(TARGET_OUT_RAMDISK_16K) | $(COMPRESSION_COMMAND) > $@
|
||||
|
Reference in New Issue
Block a user