From 038066f517d09960e4b7ea13dd514286837091fe Mon Sep 17 00:00:00 2001
From: Yo Chiang <yochiang@google.com>
Date: Mon, 17 Aug 2020 11:24:16 +0800
Subject: [PATCH] Use on_vendor VNDK APEX for non-REL build

For non-REL branch, move VNDK APEX to /vendor partition so we don't need
to update vendor.img prebuilt everytime there is a change in the VNDK
libraries.
For REL branch, the API/ABI surfaces of VNDK libraries are frozen so
don't need to move to /vendor partition.

Bug: 140136207
Test: Build on REL and non-REL branch
Change-Id: Ibce24465b546c52bc447b4b28a474de2b4b53792
---
 aosp_taimen.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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