commit 40ecbca55671429f1638ca86665ef6ca46d8f2fa
author Xin Li <delphij@google.com> Thu Oct 08 17:20:27 2020 -0700
committer Xin Li <delphij@google.com> Thu Oct 08 17:20:27 2020 -0700
tree d5edb8b3c27deeefcb40a0dd608e671f98ed6bd9
parent e0a2caae14b89554212a0d00386f3cb3ccc2c723
parent fd0a640dda5f445b5c13f35981c7dee1f9a7b62d

Skip ab/6749736 in stage.

Merged-In: I99c036576a5cc12ced295fe635aa65c265e996bf
Change-Id: I7a107b22c574877dade00986491ce07a44c8e312

aosp_taimen.mk

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