commit 55029430e29f7d0f14968b835906936bacf311a2
author Xin Li <delphij@google.com> Thu Oct 08 17:20:03 2020 -0700
committer Xin Li <delphij@google.com> Thu Oct 08 17:20:03 2020 -0700
tree f296a4cdc2c6944526705987928280276572c6b1
parent 208175c8e7fd561b9ba67c087c3839adec7d9b76
parent 457b43ee2751490f1dfbf837df2c45b5fe2c3cbe

Skip ab/6749736 in stage.

Merged-In: Ib4d17de4028d494428a4695c45fc3ccf0881c92e
Change-Id: Ie148902f3937fa242185ac2bb3c815ea902b677f

aosp_walleye.mk

diff --git a/aosp_walleye.mk b/aosp_walleye.mk
index 7137bd9..9e29c47 100644
--- a/aosp_walleye.mk
+++ b/aosp_walleye.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