commit | f17203fdf668ec62f773463c0db3a939feb470e4 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Dec 12 07:00:56 2024 -0800 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 12 07:00:56 2024 -0800 |
tree | 6c45817e0757915d48a5fbf110e7025a92336ead | |
parent | 1b408dae153e0c0a3d3c4adfed743fc89d159e5a [diff] | |
parent | 69de3efb991924b3eb66ef26e267d037f3e1c637 [diff] |
Merge "Remove constraint for RELEASE_AVF_ENABLE_EARLY_VM" into main am: 69de3efb99 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3408262 Change-Id: Ife125efec59eb8775b22a9dcfb5893c50e3721ab 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 0646e67..edc8618 100644 --- a/build/apex/product_packages.mk +++ b/build/apex/product_packages.mk
@@ -65,11 +65,3 @@ $(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