summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aosp_taimen.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/aosp_taimen.mk b/aosp_taimen.mk
index ced8b52..35e547f 100644
--- a/aosp_taimen.mk
+++ b/aosp_taimen.mk
@@ -35,7 +35,11 @@ PRODUCT_COPY_FILES += \
PRODUCT_RESTRICT_VENDOR_FILES := owner
-PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# expected to have stable API/ABI surfaces.
+ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+ PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+endif
PRODUCT_MANUFACTURER := Google
PRODUCT_BRAND := Android