diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-01-24 10:24:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-24 10:24:00 +0000 |
| commit | 03be79ba3d867d82fe5d18bdf8a78c780e6b3934 (patch) | |
| tree | 076c4841e500b77adc45951467d7cd7e3bc52882 | |
| parent | c3dce4422c1a8295c748b66931a82dd7798cc8ca (diff) | |
| parent | 0d9181921c62dcf6f0aa241f7dac0b0262dfef20 (diff) | |
| download | common-03be79ba3d867d82fe5d18bdf8a78c780e6b3934.tar.gz | |
Merge "Output boot images with kernel 5.15 in gki_$arch" am: a2d6273e8a am: 0d9181921c
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1955925
Change-Id: I18ddada60628beb5274fdec872c03690bc1b01d5
| -rw-r--r-- | gki_arm64.mk | 1 | ||||
| -rw-r--r-- | gki_arm64/BoardConfig.mk | 8 | ||||
| -rw-r--r-- | gki_x86_64.mk | 3 | ||||
| -rwxr-xr-x | gki_x86_64/BoardConfig.mk | 4 |
4 files changed, 15 insertions, 1 deletions
diff --git a/gki_arm64.mk b/gki_arm64.mk index 9597d84..ede3001 100644 --- a/gki_arm64.mk +++ b/gki_arm64.mk @@ -26,6 +26,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) include device/generic/common/gki_common.mk $(call output-kernel,kernel/prebuilts/4.19/arm64,kernel/4.19) $(call output-kernel,kernel/prebuilts/5.10/arm64,kernel/5.10) +$(call output-kernel,kernel/prebuilts/5.15/arm64,kernel/5.15) PRODUCT_NAME := gki_arm64 diff --git a/gki_arm64/BoardConfig.mk b/gki_arm64/BoardConfig.mk index c5d81b0..0263549 100644 --- a/gki_arm64/BoardConfig.mk +++ b/gki_arm64/BoardConfig.mk @@ -35,14 +35,22 @@ 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-5.15_BOOTIMAGE_PARTITION_SIZE := 67108864 +BOARD_KERNEL-5.15-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864 +BOARD_KERNEL-5.15-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 +BOARD_KERNEL-5.15-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920 +BOARD_KERNEL-5.15-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376 +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 \ endif diff --git a/gki_x86_64.mk b/gki_x86_64.mk index d01767b..75f5ff7 100644 --- a/gki_x86_64.mk +++ b/gki_x86_64.mk @@ -24,7 +24,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) # Build GKI boot images # include device/generic/common/gki_common.mk -$(call output-kernel,kernel/prebuilts/5.10/arm64,kernel/5.10) +$(call output-kernel,kernel/prebuilts/5.10/x86_64,kernel/5.10) +$(call output-kernel,kernel/prebuilts/5.15/x86_64,kernel/5.15) PRODUCT_NAME := gki_x86_64 diff --git a/gki_x86_64/BoardConfig.mk b/gki_x86_64/BoardConfig.mk index 48a1499..6321edc 100755 --- a/gki_x86_64/BoardConfig.mk +++ b/gki_x86_64/BoardConfig.mk @@ -26,13 +26,17 @@ include device/generic/common/BoardConfigGkiCommon.mk BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_KERNEL-5.10_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_KERNEL-5.10-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864 +BOARD_KERNEL-5.15_BOOTIMAGE_PARTITION_SIZE := 67108864 +BOARD_KERNEL-5.15-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864 # Boot images BOARD_KERNEL_BINARIES := \ kernel-5.10 \ + kernel-5.15 \ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) BOARD_KERNEL_BINARIES += \ kernel-5.10-allsyms \ + kernel-5.15-allsyms \ endif |