commit 690b0317968056ec5bfbafc89b93fdff6cf5a243
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 29 15:54:19 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 29 15:54:19 2024 +0000
tree 9545803c7ed46c0d5c2fa9e474ab84ece2eada61
parent 8c67307c49dd9e951f1b5a10abbc14efeefc735b
parent 67710333acca99808fc6a2dc62fe116514976292

Merge "Restrict RELEASE_AVF_ENABLE_EARLY_VM flag to only trunk_staging" into main

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