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

Commit 72ea5899 authored Dec 16, 2024 by Automerger Merge Worker

Merge "Merge "GSI: build pvmfw.img" into android15-tests-dev am: 343638f1"...

Merge "Merge "GSI: build pvmfw.img" into android15-tests-dev am: 343638f1" into main am: 97d74af5 am: dd8e4d96

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

Change-Id: Ib0b43cdfff5632989b32567fba0f0cedd11b31ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 0db39045 dd8e4d96

target/board/BoardConfigGsiCommon.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,11 @@ BOARD_SUPER_PARTITION_SIZE := 3229614080
		BOARD_SUPER_PARTITION_GROUPS := gsi_dynamic_partitions
		BOARD_GSI_DYNAMIC_PARTITIONS_PARTITION_LIST := system
		BOARD_GSI_DYNAMIC_PARTITIONS_SIZE := 3221225472

		# Build pvmfw with GSI: b/376363989
		ifeq (true,$(PRODUCT_BUILD_PVMFW_IMAGE))
		BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
		endif
		endif

		# TODO(b/123695868, b/146149698):

target/product/gsi_release.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,11 @@ PRODUCT_BUILD_SUPER_EMPTY_IMAGE := false
		PRODUCT_BUILD_SYSTEM_DLKM_IMAGE := false
		PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST := true

		# Build pvmfw with GSI: b/376363989, pvmfw currently only supports AArch64
		ifneq (,$(filter %_arm64,$(TARGET_PRODUCT)))
		PRODUCT_BUILD_PVMFW_IMAGE := true
		endif

		# Additional settings used in all GSI builds
		PRODUCT_PRODUCT_PROPERTIES += \
		ro.crypto.metadata_init_delete_all_keys.enabled=false \