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

Commit 5cba21b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "initial GKI boot.img support" into rvc-dev am: 79875a12 am: 709390ee 

Change-Id: Iee9f1fb9e7e90591e316897899ae2e1d86df65f3
parents 766df06f 709390ee

core/board_config.mk

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

BUILDING_VENDOR_BOOT_IMAGE :=

ifdef BOARD_BOOT_HEADER_VERSION

ifdef BOARD_BOOT_HEADER_VERSION

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

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

    ifneq ($(TARGET_NO_VENDOR_BOOT),true)

      BUILDING_VENDOR_BOOT_IMAGE := true

      BUILDING_VENDOR_BOOT_IMAGE := true

    endif

    ifdef BUILDING_RECOVERY_IMAGE

    ifdef BUILDING_RECOVERY_IMAGE

      ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

      ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)

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

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

target/board/generic_arm64/BoardConfig.mk

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

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

include build/make/target/board/BoardConfigEmuCommon.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_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

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

# cleaned up all device specific directories under root!

# cleaned up all device specific directories under root!

target/board/generic_arm64/device.mk

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

# 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.

# 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/base/build/tablet-dalvik-heap.mk)

$(call inherit-product-if-exists, frameworks/native/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 Original line 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

# 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)/product/emulator_vendor.mk)

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

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

target/product/sdk_phone_arm64.mk

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

QEMU_USE_SYSTEM_EXT_PARTITIONS := true





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

$(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.

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

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

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