commit a903c2d23046b3381f69fe77d960eb26c19c5e46
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 13 05:35:05 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 13 05:35:05 2024 -0800
tree c6e8972c7f18cf6e3b5ed570160ce9f5eb2d7622
parent c676a38c9e8efbc36aafd664258ad347866c9796
parent df5af377da6f525806294c22209302413f5175d4

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

target/board/BoardConfigGsiCommon.mk

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