commit be3ce0f08fdc35afddae7c90c13d6f18bf89618a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 13 02:24:24 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 13 02:24:24 2024 -0800
tree 610fa7c7f47f4afed783c930ac2917b14cde5a1e
parent b2113b08ef80fc950a8870824bc34646b1fa410c
parent f4d31a590aa086ffbea84d01748c4d0e50c439e8

Merge "GSI: build pvmfw" into android15-tests-dev

target/board/BoardConfigGsiCommon.mk

diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk
index 67e31df..ab42a21 100644
--- a/target/board/BoardConfigGsiCommon.mk
+++ b/target/board/BoardConfigGsiCommon.mk
@@ -69,6 +69,9 @@
 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

diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index 39428d2..278e53b 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -79,6 +79,9 @@
 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 \