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

Commit 3363a0b8 authored by Steve Muckle's avatar Steve Muckle
Browse files

initial GKI boot.img support 

The GKI boot.img should be generated alongside the GSI. To make this
possible, define a flag (TARGET_NO_VENDOR_BOOT) that can be used to
disable the generation of the vendor_boot image.

Bug: 138323550
Change-Id: I91181853b26815e68a2fa2216b68579780d034dc
parent 6bf4a7d0

core/board_config.mk

+3 −1
Original line number Diff line number Diff line
@@ -361,7 +361,9 @@ endif 
BUILDING_VENDOR_BOOT_IMAGE :=

ifdef BOARD_BOOT_HEADER_VERSION

  ifneq ($(call math_gt_or_eq,$(BOARD_BOOT_HEADER_VERSION),3),)

    ifneq ($(TARGET_NO_VENDOR_BOOT),true)

      BUILDING_VENDOR_BOOT_IMAGE := true

    endif

    ifdef BUILDING_RECOVERY_IMAGE

      ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

        $(error Boot header version >=3 requires recovery as boot)

target/board/generic_arm64/BoardConfig.mk

+8 −0
Original line number Diff line number Diff line
@@ -55,8 +55,16 @@ endif 
include build/make/target/board/BoardConfigGsiCommon.mk

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



TARGET_NO_KERNEL := false

TARGET_NO_VENDOR_BOOT := true

BOARD_USES_RECOVERY_AS_BOOT := true



BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000

BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800



BOARD_BOOT_HEADER_VERSION := 3

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)



# Emulator system image is going to be used as GSI and some vendor still hasn't

# cleaned up all device specific directories under root!

target/board/generic_arm64/device.mk

+10 −0
Original line number Diff line number Diff line
@@ -14,6 +14,16 @@ 
# limitations under the License.

#



# Cuttlefish has GKI kernel prebuilts, so use those for the GKI boot.img.

ifeq ($(TARGET_PREBUILT_KERNEL),)

    LOCAL_KERNEL := device/google/cuttlefish_kernel/5.4-arm64/kernel

else

    LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)

endif



PRODUCT_COPY_FILES += \

    $(LOCAL_KERNEL):kernel



# Adjust the Dalvik heap to be appropriate for a tablet.

$(call inherit-product-if-exists, frameworks/base/build/tablet-dalvik-heap.mk)

$(call inherit-product-if-exists, frameworks/native/build/tablet-dalvik-heap.mk)

target/product/aosp_arm64.mk

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) 
#

# All components inherited here go to vendor image

#

$(call inherit-product-if-exists, device/generic/goldfish/arm64-vendor.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)

target/product/sdk_phone_arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
QEMU_USE_SYSTEM_EXT_PARTITIONS := true



$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)

$(call inherit-product-if-exists, device/generic/goldfish/arm64-vendor.mk)



# Define the host tools and libs that are parts of the SDK.

$(call inherit-product, sdk/build/product_sdk.mk)