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

Commit ac744291 authored by Bo Hu's avatar Bo Hu Committed by Gerrit Code Review
Browse files

Merge "emulator: enable vendor boot image"

parents f6baf822 8fd437c8

core/Makefile

+15 −0
Original line number Diff line number Diff line
@@ -5186,6 +5186,20 @@ $(INSTALLED_QEMU_VENDORIMAGE): $(INSTALLED_VENDORIMAGE_TARGET) $(MK_QEMU_IMAGE_S 
vendorimage: $(INSTALLED_QEMU_VENDORIMAGE)

droidcore: $(INSTALLED_QEMU_VENDORIMAGE)

endif



ifdef INSTALLED_RAMDISK_TARGET

ifdef INSTALLED_VENDOR_BOOTIMAGE_TARGET

ifdef INTERNAL_VENDOR_RAMDISK_TARGET

INSTALLED_QEMU_RAMDISKIMAGE := $(PRODUCT_OUT)/ramdisk-qemu.img

$(INSTALLED_QEMU_RAMDISKIMAGE): $(INTERNAL_VENDOR_RAMDISK_TARGET) $(INSTALLED_RAMDISK_TARGET)

	@echo Create ramdisk-qemu.img

	(cat $(INSTALLED_RAMDISK_TARGET) $(INTERNAL_VENDOR_RAMDISK_TARGET) > $(INSTALLED_QEMU_RAMDISKIMAGE))



droidcore: $(INSTALLED_QEMU_RAMDISKIMAGE)

endif

endif

endif



ifdef INSTALLED_PRODUCTIMAGE_TARGET

INSTALLED_QEMU_PRODUCTIMAGE := $(PRODUCT_OUT)/product-qemu.img

$(INSTALLED_QEMU_PRODUCTIMAGE): $(INSTALLED_PRODUCTIMAGE_TARGET) $(MK_QEMU_IMAGE_SH) $(SGDISK_HOST) $(SIMG2IMG)
@@ -5323,6 +5337,7 @@ deps := \ 
	$(APPCOMPAT_ZIP) \

	$(INSTALLED_SYSTEMIMAGE_TARGET) \

	$(INSTALLED_QEMU_SYSTEMIMAGE) \

	$(INSTALLED_QEMU_RAMDISKIMAGE) \

	$(INSTALLED_QEMU_VENDORIMAGE) \

	$(QEMU_VERIFIED_BOOT_PARAMS) \

	$(INSTALLED_USERDATAIMAGE_TARGET) \

core/tasks/sdk-addon.mk

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ endif 
files_to_copy += \

	$(addon_dir_img):$(INSTALLED_QEMU_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \

	$(addon_dir_img):$(INSTALLED_QEMU_VENDORIMAGE):images/$(TARGET_CPU_ABI)/vendor.img \

	$(addon_dir_img):$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \

	$(addon_dir_img):$(INSTALLED_QEMU_RAMDISKIMAGE):images/$(TARGET_CPU_ABI)/ramdisk.img \

	$(addon_dir_img):$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \

	$(addon_dir_img):device/generic/goldfish/data/etc/userdata.img:images/$(TARGET_CPU_ABI)/userdata.img \

	$(addon_dir_img):$(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt \

target/board/BoardConfigEmuCommon.mk

+7 −0
Original line number Diff line number Diff line
@@ -74,6 +74,13 @@ else 
  BOARD_VENDORIMAGE_PARTITION_SIZE := 146800640

endif



#vendor boot

TARGET_NO_VENDOR_BOOT := false

BOARD_INCLUDE_DTB_IN_BOOTIMG := false

BOARD_BOOT_HEADER_VERSION := 3

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)

BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x06000000



# Enable chain partition for system.

BOARD_AVB_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem

BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048

target/board/generic_arm64/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ include build/make/target/board/BoardConfigGsiCommon.mk 
include build/make/target/board/BoardConfigEmuCommon.mk



TARGET_NO_KERNEL := false

TARGET_NO_VENDOR_BOOT := true

TARGET_NO_VENDOR_BOOT := false

BOARD_USES_RECOVERY_AS_BOOT := true



BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000

target/product/aosp_arm64.mk

+2 −1
Original line number Diff line number Diff line
@@ -51,8 +51,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) 
$(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 or vendor_boot 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)