From 870752dfd2e71c6477d010eb6df28e2d72473783 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Tue, 15 Jun 2021 16:43:46 +0800 Subject: [PATCH] Remove mainline boot.img from GSI targets Originally, the mainline kernel is for Android12. The mainline kernel is changing to the next Android version. We don't need to includes mainline boot.img in GSI targets. Bug: 191120961 Test: TH and check the built result Change-Id: Icd7677f362077eb675760d51a8f01c5db8baf7e1 --- target/board/generic_arm64/BoardConfig.mk | 4 ---- target/board/generic_arm64/device.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 21b4065487..d10580edfb 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -68,9 +68,6 @@ BOARD_KERNEL-5.10-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 BOARD_KERNEL-5.10-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920 BOARD_KERNEL-5.10-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376 BOARD_KERNEL-5.10-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376 -BOARD_KERNEL-MAINLINE_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_KERNEL-MAINLINE-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 -BOARD_KERNEL-MAINLINE-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 @@ -78,7 +75,6 @@ BOARD_KERNEL_BINARIES := \ kernel-4.19-gz \ kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 \ kernel-5.10 kernel-5.10-gz kernel-5.10-lz4 \ - kernel-mainline kernel-mainline-gz kernel-mainline-lz4 \ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) BOARD_KERNEL_BINARIES += \ diff --git a/target/board/generic_arm64/device.mk b/target/board/generic_arm64/device.mk index 27dc158fbd..39dc7ba378 100644 --- a/target/board/generic_arm64/device.mk +++ b/target/board/generic_arm64/device.mk @@ -22,14 +22,10 @@ PRODUCT_COPY_FILES += \ kernel/prebuilts/5.10/arm64/kernel-5.10:kernel-5.10 \ kernel/prebuilts/5.10/arm64/kernel-5.10-gz:kernel-5.10-gz \ kernel/prebuilts/5.10/arm64/kernel-5.10-lz4:kernel-5.10-lz4 \ - kernel/prebuilts/mainline/arm64/kernel-mainline-allsyms:kernel-mainline \ - kernel/prebuilts/mainline/arm64/kernel-mainline-gz-allsyms:kernel-mainline-gz \ - kernel/prebuilts/mainline/arm64/kernel-mainline-lz4-allsyms:kernel-mainline-lz4 \ $(call dist-for-goals, dist_files, kernel/prebuilts/4.19/arm64/prebuilt-info.txt:kernel/4.19/prebuilt-info.txt) $(call dist-for-goals, dist_files, kernel/prebuilts/5.4/arm64/prebuilt-info.txt:kernel/5.4/prebuilt-info.txt) $(call dist-for-goals, dist_files, kernel/prebuilts/5.10/arm64/prebuilt-info.txt:kernel/5.10/prebuilt-info.txt) -$(call dist-for-goals, dist_files, kernel/prebuilts/mainline/arm64/prebuilt-info.txt:kernel/mainline/prebuilt-info.txt) ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \