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

Commit 254552fd authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Enable BOARD_USES_GKI on aosp_arm64" am: 4503e6e3 am: edd0abfb 

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

Change-Id: I49841c1a3baa308127d7ee2ebd97146690ebd917
parents 67c472a3 edd0abfb

target/board/generic_arm64/BoardConfig.mk

+11 −3
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ endif 


include build/make/target/board/BoardConfigGsiCommon.mk



TARGET_NO_KERNEL := false

BOARD_USES_RECOVERY_AS_BOOT := true



BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920

BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864

BOARD_KERNEL-5.4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864
@@ -79,8 +76,19 @@ BOARD_KERNEL_BINARIES := kernel-4.19-gz kernel-5.4 kernel-5.4-gz kernel-5.4-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

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



# No vendor_boot

BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT :=



# No recovery

BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE :=



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

# root!

target/board/generic_arm64/device.mk

+1 −0
Original line number Diff line number Diff line
@@ -31,3 +31,4 @@ PRODUCT_COPY_FILES += \ 
endif



PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false

PRODUCT_BUILD_RECOVERY_IMAGE := false