summaryrefslogtreecommitdiff
path: root/aosp_bramble.mk
diff options
context:
space:
mode:
authorYo Chiang <yochiang@google.com>2020-08-17 11:52:31 +0800
committerYi-yo Chiang <yochiang@google.com>2020-08-17 03:55:52 +0000
commit6d5e3a415c167199e0aee0a1e42b09730cf15300 (patch)
treec64b80fb11333b0492a2062b217676a6057a2ee8 /aosp_bramble.mk
parent06da82899db6e86c6b4aff77a49a2aeb3ca6bc99 (diff)
downloadbramble-6d5e3a415c167199e0aee0a1e42b09730cf15300.tar.gz
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
Diffstat (limited to 'aosp_bramble.mk')
-rw-r--r--aosp_bramble.mk6
1 files changed, 6 insertions, 0 deletions
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