Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I6421c2bcd0d8252ec1aafe0c316ebbca46f6fe20
Change-Id: I5ba640a8fb8b578755c1a7366d368ef1d81f7160
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_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
