Move VNDK APEX to vendor partition
... for aosp_* targets so that we don't need to update vendor.img everytime
there is a change in the VNDK libraries
Bug: 140136207
Test: m
Merged-In: If60b17813b57b0fe836aa8eb1b8e5efbcc61ee2a
(cherry picked from commit 8f52efa9b1567f3192d4b0c838ca294b93d726dc)
Change-Id: If60b17813b57b0fe836aa8eb1b8e5efbcc61ee2a
diff --git a/aosp_blueline.mk b/aosp_blueline.mk
index f734c69..624d5da 100644
--- a/aosp_blueline.mk
+++ b/aosp_blueline.mk
@@ -49,6 +49,8 @@
# STOPSHIP deal with Qualcomm stuff later
# PRODUCT_RESTRICT_VENDOR_FILES := all
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+
PRODUCT_MANUFACTURER := Google
PRODUCT_NAME := aosp_blueline
diff --git a/aosp_crosshatch.mk b/aosp_crosshatch.mk
index bb3389a..c921d36 100644
--- a/aosp_crosshatch.mk
+++ b/aosp_crosshatch.mk
@@ -49,6 +49,8 @@
# STOPSHIP deal with Qualcomm stuff later
# PRODUCT_RESTRICT_VENDOR_FILES := all
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+
PRODUCT_MANUFACTURER := Google
PRODUCT_NAME := aosp_crosshatch
