From a2a360813fa916224ad7211bb61a553137bb668b Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Fri, 25 Mar 2022 12:43:49 +0800 Subject: [PATCH] Add parameters to repack_kernels.sh To handle different CPU architectures and build variants. To avoid output dist/kernel/*-debug folder on user builds Bug: 226297708 Test: TH Change-Id: I8ebfa00cb3f9e54bc131d8226cf756f92335be19 --- gsi/build_with_kernel/repack_kernels.sh | 28 ++++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/gsi/build_with_kernel/repack_kernels.sh b/gsi/build_with_kernel/repack_kernels.sh index cb03a7502..8dd0ed771 100755 --- a/gsi/build_with_kernel/repack_kernels.sh +++ b/gsi/build_with_kernel/repack_kernels.sh @@ -18,6 +18,9 @@ source development/gsi/build_with_kernel/repack_kernels_common.sh set -e +ARCH=$1 +BUILD_VARIANT=$2 + prepare_lz4 prepare_kernel_image \ @@ -25,27 +28,32 @@ prepare_kernel_image \ "5.10" \ "arm64" -prepare_kernel_image \ - "artifacts/common-android13-5_10-kernel_debug_aarch64" \ - "5.10" \ - "arm64" \ - "debug" +if [[ "$BUILD_VARIANT" == "debug" ]]; then + prepare_kernel_image \ + "artifacts/common-android13-5_10-kernel_debug_aarch64" \ + "5.10" \ + "arm64" \ + "debug" +fi prepare_kernel_modules \ "artifacts/common-android13-5_10-kernel_virt_aarch64" \ "5.10" \ "arm64" + prepare_kernel_image \ "artifacts/common-android13-5_15-kernel_aarch64" \ "5.15" \ "arm64" -prepare_kernel_image \ - "artifacts/common-android13-5_15-kernel_debug_aarch64" \ - "5.15" \ - "arm64" \ - "debug" +if [[ "$BUILD_VARIANT" == "debug" ]]; then + prepare_kernel_image \ + "artifacts/common-android13-5_15-kernel_debug_aarch64" \ + "5.15" \ + "arm64" \ + "debug" +fi prepare_kernel_modules \ "artifacts/common-android13-5_15-kernel_virt_aarch64" \