commit bba215cca46c8aecdaf6b97ed14e079b1aec784a
author SzuWei Lin <szuweilin@google.com> Fri May 27 00:21:08 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 27 00:21:08 2022 +0000
tree 7d262a9ec094e380a7989a60d9d672773d69c169
parent a533e8ff0e6ed584f91340f731950429f5bd400a
parent 0b14b124311f1c8e30ea9d8b2174990a4cf35006

Merge "Remove outputing boot-4.19*.img from target gki_arm64"

gki_arm64.mk

diff --git a/gki_arm64.mk b/gki_arm64.mk
index 3ff21cd..f826bb4 100644
--- a/gki_arm64.mk
+++ b/gki_arm64.mk
@@ -26,9 +26,6 @@
 include device/generic/common/gki_common.mk
 
 PRODUCT_COPY_FILES += \
-    kernel/prebuilts/4.19/arm64/kernel-4.19:kernel-4.19 \
-    kernel/prebuilts/4.19/arm64/kernel-4.19-gz:kernel-4.19-gz \
-    kernel/prebuilts/4.19/arm64/kernel-4.19-lz4:kernel-4.19-lz4 \
     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 \
@@ -36,15 +33,11 @@
     kernel/prebuilts/5.15/arm64/kernel-5.15-gz:kernel-5.15-gz \
     kernel/prebuilts/5.15/arm64/kernel-5.15-lz4:kernel-5.15-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.10/arm64/prebuilt-info.txt:kernel/5.10/prebuilt-info.txt)
 $(call dist-for-goals,dist_files,kernel/prebuilts/5.15/arm64/prebuilt-info.txt:kernel/5.15/prebuilt-info.txt)
 
 ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
-    kernel/prebuilts/4.19/arm64/kernel-4.19-allsyms:kernel-4.19-allsyms \
-    kernel/prebuilts/4.19/arm64/kernel-4.19-gz-allsyms:kernel-4.19-gz-allsyms \
-    kernel/prebuilts/4.19/arm64/kernel-4.19-lz4-allsyms:kernel-4.19-lz4-allsyms \
     kernel/prebuilts/5.10/arm64/kernel-5.10-allsyms:kernel-5.10-allsyms \
     kernel/prebuilts/5.10/arm64/kernel-5.10-gz-allsyms:kernel-5.10-gz-allsyms \
     kernel/prebuilts/5.10/arm64/kernel-5.10-lz4-allsyms:kernel-5.10-lz4-allsyms \
@@ -52,7 +45,6 @@
     kernel/prebuilts/5.15/arm64/kernel-5.15-gz-allsyms:kernel-5.15-gz-allsyms \
     kernel/prebuilts/5.15/arm64/kernel-5.15-lz4-allsyms:kernel-5.15-lz4-allsyms \
 
-$(call dist-for-goals,dist_files,kernel/prebuilts/4.19/arm64/prebuilt-info.txt:kernel/4.19-debug/prebuilt-info.txt)
 $(call dist-for-goals,dist_files,kernel/prebuilts/5.10/arm64/prebuilt-info.txt:kernel/5.10-debug/prebuilt-info.txt)
 $(call dist-for-goals,dist_files,kernel/prebuilts/5.15/arm64/prebuilt-info.txt:kernel/5.15-debug/prebuilt-info.txt)
 

gki_arm64/BoardConfig.mk

diff --git a/gki_arm64/BoardConfig.mk b/gki_arm64/BoardConfig.mk
index 0263549..224c0c0 100644
--- a/gki_arm64/BoardConfig.mk
+++ b/gki_arm64/BoardConfig.mk
@@ -27,8 +27,6 @@
 
 include device/generic/common/BoardConfigGkiCommon.mk
 
-BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920
-BOARD_KERNEL-4.19-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920
 BOARD_KERNEL-5.10_BOOTIMAGE_PARTITION_SIZE := 67108864
 BOARD_KERNEL-5.10-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864
 BOARD_KERNEL-5.10-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920
@@ -43,13 +41,11 @@
 BOARD_KERNEL-5.15-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376
 
 BOARD_KERNEL_BINARIES := \
-    kernel-4.19-gz \
     kernel-5.10 kernel-5.10-gz kernel-5.10-lz4 \
     kernel-5.15 kernel-5.15-gz kernel-5.15-lz4 \
 
 ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
 BOARD_KERNEL_BINARIES += \
-    kernel-4.19-gz-allsyms \
     kernel-5.10-allsyms kernel-5.10-gz-allsyms kernel-5.10-lz4-allsyms \
     kernel-5.15-allsyms kernel-5.15-gz-allsyms kernel-5.15-lz4-allsyms \