From 0ddb120856b4b845f23662bce52df10f56b79be9 Mon Sep 17 00:00:00 2001 From: Yo Chiang 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_oriole.mk | 6 +++++- aosp_raven.mk | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/aosp_oriole.mk b/aosp_oriole.mk index 113f679..568d14f 100644 --- a/aosp_oriole.mk +++ b/aosp_oriole.mk @@ -23,4 +23,8 @@ PRODUCT_MODEL := AOSP on Oriole PRODUCT_BRAND := Android PRODUCT_MANUFACTURER := Google -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 diff --git a/aosp_raven.mk b/aosp_raven.mk index f434886..18da783 100644 --- a/aosp_raven.mk +++ b/aosp_raven.mk @@ -26,4 +26,8 @@ PRODUCT_BRAND := Android PRODUCT_BRAND_FOR_ATTESTATION := google PRODUCT_MANUFACTURER := Google -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