| commit | 170a0b413a3730f5f08e72efd863238123e393fa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 29 16:00:12 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 29 16:00:12 2024 +0000 |
| tree | 9545803c7ed46c0d5c2fa9e474ab84ece2eada61 | |
| parent | effcc3e3e67341966169dfdafa50d3c979c6ea63 [diff] | |
| parent | 690b0317968056ec5bfbafc89b93fdff6cf5a243 [diff] |
Merge "Restrict RELEASE_AVF_ENABLE_EARLY_VM flag to only trunk_staging" into main am: 690b031796 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3247282 Change-Id: I4beefddc97b2ea23891308b4e89ec58ef946a4f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/build/apex/product_packages.mk b/build/apex/product_packages.mk index e710021..efa8dd5 100644 --- a/build/apex/product_packages.mk +++ b/build/apex/product_packages.mk
@@ -62,3 +62,11 @@ $(error RELEASE_AVF_ENABLE_LLPVM_CHANGES must also be enabled) endif endif + +ifdef RELEASE_AVF_ENABLE_EARLY_VM + # We can't query TARGET_RELEASE from here, so we use RELEASE_AIDL_USE_UNFROZEN as a proxy value of + # whether we are building -next release. + ifneq ($(RELEASE_AIDL_USE_UNFROZEN),true) + $(error RELEASE_AVF_ENABLE_EARLY_VM can only be enabled in trunk_staging until b/357025924 is fixed) + endif +endif