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

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

Change-Id: I1688e68564e6eb4971177c272f62d578ebebd2c1
This commit is contained in:
Treehugger Robot 2020-07-24 22:31:52 +00:00 committed by Automerger Merge Worker
commit 4e4699afeb
2 changed files with 10 additions and 2 deletions

View file

@ -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!

View file

@ -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