Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42de1ac4 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Add 5.10-android12-0 KMI for generic_arm64" am: 1ed887f2 

Original change: https://android-review.googlesource.com/c/platform/build/+/1531942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0883d63057732c5c13c0e6a75154596dc00797ff
parents 9120e986 1ed887f2

target/board/generic_arm64/BoardConfig.mk

+20 −4
Original line number Diff line number Diff line
@@ -61,6 +61,12 @@ BOARD_KERNEL-5.4-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 
BOARD_KERNEL-5.4-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-5.4-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376

BOARD_KERNEL-5.4-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376

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

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
@@ -71,17 +77,27 @@ BOARD_RAMDISK_USE_LZ4 := true 
BOARD_BOOT_HEADER_VERSION := 3

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)



BOARD_KERNEL_BINARIES := kernel-4.19-gz kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 \

    kernel-mainline kernel-mainline-gz kernel-mainline-lz4

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 += kernel-5.4-allsyms kernel-5.4-gz-allsyms kernel-5.4-lz4-allsyms

BOARD_KERNEL_BINARIES += \

    kernel-5.4-allsyms kernel-5.4-gz-allsyms kernel-5.4-lz4-allsyms \

    kernel-5.10-allsyms kernel-5.10-gz-allsyms kernel-5.10-lz4-allsyms \



endif



# Boot image

BOARD_USES_RECOVERY_AS_BOOT :=

TARGET_NO_KERNEL := false

BOARD_USES_GENERIC_KERNEL_IMAGE := true

BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := 5.4-android12-0

BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := \

    5.4-android12-0 \

    5.10-android12-0 \



# Copy boot image in $OUT to target files. This is defined for targets where

# the installed GKI APEXes are built from source.

BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES := true

target/board/generic_arm64/device.mk

+8 −1
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ PRODUCT_COPY_FILES += \ 
    kernel/prebuilts/5.4/arm64/kernel-5.4:kernel-5.4 \

    kernel/prebuilts/5.4/arm64/kernel-5.4-gz:kernel-5.4-gz \

    kernel/prebuilts/5.4/arm64/kernel-5.4-lz4:kernel-5.4-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 \

    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
@@ -27,7 +30,11 @@ ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) 
PRODUCT_COPY_FILES += \

    kernel/prebuilts/5.4/arm64/kernel-5.4:kernel-5.4-allsyms \

    kernel/prebuilts/5.4/arm64/kernel-5.4-gz:kernel-5.4-gz-allsyms \

    kernel/prebuilts/5.4/arm64/kernel-5.4-lz4:kernel-5.4-lz4-allsyms

    kernel/prebuilts/5.4/arm64/kernel-5.4-lz4:kernel-5.4-lz4-allsyms \

    kernel/prebuilts/5.10/arm64/kernel-5.10:kernel-5.10-allsyms \

    kernel/prebuilts/5.10/arm64/kernel-5.10-gz:kernel-5.10-gz-allsyms \

    kernel/prebuilts/5.10/arm64/kernel-5.10-lz4:kernel-5.10-lz4-allsyms \



endif



PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false