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

Commit 4e4699af authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "add android-mainline kernels to aosp_arm64 build" am: a5fb54f6 

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

Change-Id: I1688e68564e6eb4971177c272f62d578ebebd2c1
parents 6820c719 a5fb54f6

target/board/generic_arm64/BoardConfig.mk

+6 −1
Original line number Diff line number Diff line
@@ -61,12 +61,17 @@ BOARD_USES_RECOVERY_AS_BOOT := true 
BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.4-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-5.4-LZ4_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



BOARD_BOOT_HEADER_VERSION := 3

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)



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

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

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



# Some vendors still haven't cleaned up all device specific directories under

# root!

target/board/generic_arm64/device.mk

+4 −1
Original line number Diff line number Diff line
@@ -17,4 +17,7 @@ 
PRODUCT_COPY_FILES += \

    device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4:kernel-5.4 \

    device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-gz:kernel-5.4-gz \

    device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-lz4:kernel-5.4-lz4
 
    device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-lz4:kernel-5.4-lz4 \

    kernel/prebuilts/mainline/arm64/kernel-mainline:kernel-mainline \

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

    kernel/prebuilts/mainline/arm64/kernel-mainline-lz4:kernel-mainline-lz4