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

Commit df9ebf35 authored Dec 13, 2024 by Automerger Merge Worker

Merge "Merge "Revert "GSI: build pvmfw"" into android15-tests-dev am:...

Merge "Merge "Revert "GSI: build pvmfw"" into android15-tests-dev am: 069a5cd7" into main am: a903c2d2

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

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

parents 5e81254a a903c2d2

target/board/BoardConfigGsiCommon.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -69,9 +69,6 @@ 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

+0 −3

Original line number	Diff line number	Diff line
		@@ -79,9 +79,6 @@ 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 \