From ca961096fca7a549f50097c37a0ea0e992be1225 Mon Sep 17 00:00:00 2001 From: Howard Chen Date: Mon, 8 Nov 2021 10:35:14 +0800 Subject: [PATCH] Deprecate prebuilts/misc/linux-x86/lz4/lz4 Replace prebuilts/misc/linux-x86/lz4/lz4 with external/lz4. Test: \ development/gsi/build_with_kernel/fetch_kernel.sh \ development/gsi/build_with_kernel/repack_kernels.sh Bug: 205492988 Change-Id: Ic22e6ea7cc68b45761b963ea3c41fd099ea29bc9 --- gsi/build_with_kernel/repack_kernels.sh | 2 ++ gsi/build_with_kernel/repack_kernels_common.sh | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gsi/build_with_kernel/repack_kernels.sh b/gsi/build_with_kernel/repack_kernels.sh index adcfcac88..4d28ea749 100755 --- a/gsi/build_with_kernel/repack_kernels.sh +++ b/gsi/build_with_kernel/repack_kernels.sh @@ -18,6 +18,8 @@ source development/gsi/build_with_kernel/repack_kernels_common.sh set -e +prepare_lz4 + prepare_kernel_image \ "artifacts/common-android13-5_10-kernel_aarch64" \ "5.10" \ diff --git a/gsi/build_with_kernel/repack_kernels_common.sh b/gsi/build_with_kernel/repack_kernels_common.sh index c18e4b345..ebed4715c 100755 --- a/gsi/build_with_kernel/repack_kernels_common.sh +++ b/gsi/build_with_kernel/repack_kernels_common.sh @@ -29,8 +29,17 @@ if [[ -z "${DIST_DIR}" ]]; then fi GZIP="gzip" -LZ4="${WD}/prebuilts/misc/linux-x86/lz4/lz4" +LZ4="${OUT_DIR}/host/linux-x86/bin/lz4" +function prepare_lz4() +{ + if ! [ -f ${LZ4} ]; then + echo "make $LZ4" + cd ${WD} + make lz4 + cd - + fi +} function prepare_kernel_image() {