From 6d5e3a415c167199e0aee0a1e42b09730cf15300 Mon Sep 17 00:00:00 2001
From: Yo Chiang <yochiang@google.com>
Date: Mon, 17 Aug 2020 11:52:31 +0800
Subject: 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: I36d56a14ad17751718bce09ed911860c16f65aae
---
 aosp_bramble.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/aosp_bramble.mk b/aosp_bramble.mk
index 0f773ba..f0aeaf2 100644
--- a/aosp_bramble.mk
+++ b/aosp_bramble.mk
@@ -49,6 +49,12 @@ $(call inherit-product-if-exists, vendor/google_devices/bramble/prebuilts/device
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml
 
+# 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
+
 # Don't build super.img.
 PRODUCT_BUILD_SUPER_PARTITION := false
 
-- 
cgit v1.2.3