commit 07cde90f4f060b7235e92e08940d4ab7f891a338
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 29 16:09:47 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 29 16:09:47 2024 +0000
tree 943d49f4b4ca0f378312dadc2a8bdc0044b948c4
parent f757cafd3b22125ccfff722aacb5411793e29858
parent 170a0b413a3730f5f08e72efd863238123e393fa

Merge "Restrict RELEASE_AVF_ENABLE_EARLY_VM flag to only trunk_staging" into main am: 690b031796 am: 170a0b413a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3247282

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

build/apex/product_packages.mk

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