StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "add android-mainline kernels to aosp_arm64 build" into rvc-dev-plus-aosp am: ac69af7fc0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12226085

Change-Id: I981e0a8d561ebc02b40e3e3eefa3a99ffd9b4270
This commit is contained in:
TreeHugger Robot
2020-07-24 19:50:00 +00:00
committed by Automerger Merge Worker
parent 3e0f693ae0 ac69af7fc0
commit 98d4f05bff
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
target/board/generic_arm64/BoardConfig.mk
View File

@@ -62,13 +62,18 @@ BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920
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_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
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
# Some vendors still haven't cleaned up all device specific directories under
# root!

5
target/board/generic_arm64/device.mk
View File

@@ -18,4 +18,7 @@ PRODUCT_COPY_FILES += \
kernel/prebuilts/4.19/arm64/Image.gz:kernel-4.19-gz \
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