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

Commit 48d96c50 authored Dec 13, 2024 by Automerger Merge Worker

Merge "Merge "GSI: build pvmfw" into android15-tests-dev am: be3ce0f0" into main am: dc4edb6d

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

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

parents 8d31abde dc4edb6d

target/board/BoardConfigGsiCommon.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,9 @@ 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
		BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
		endif

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

target/product/gsi_release.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,9 @@ 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
		PRODUCT_BUILD_PVMFW_IMAGE := true

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