diff options
| author | 2024-12-16 04:01:13 -0800 | |
|---|---|---|
| committer | 2024-12-16 04:01:13 -0800 | |
| commit | 1e188cfea883ea0755ee15d5b7bc06ea33c9d6fb (patch) | |
| tree | 3a21146c712fb274909e95a55c8f51437ef3f62e | |
| parent | 81f12b92083adc02a615725bb51396d856be3261 (diff) | |
| parent | 343638f1abc4c1e449020807b3feb747313128e9 (diff) | |
Merge "GSI: build pvmfw.img" into android15-tests-dev am: 343638f1ab
Original change: https://android-review.googlesource.com/c/platform/build/+/3414600
Change-Id: If4eaa9ae4db3e2bd19b76b1a9d31e079984ee03c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | target/board/BoardConfigGsiCommon.mk | 5 | ||||
| -rw-r--r-- | target/product/gsi_release.mk | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 67e31dfa5f..8a62796e51 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -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): diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index f00c38cedf..115b355920 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -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 \ |