From 0d8a80f6ee4f3e10a0e8e33b02c7a973fce81fac 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_cheetah.mk | 6 +++++- aosp_panther.mk | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/aosp_cheetah.mk b/aosp_cheetah.mk index 8f44682..2055fd5 100644 --- a/aosp_cheetah.mk +++ b/aosp_cheetah.mk @@ -31,4 +31,8 @@ PRODUCT_MANUFACTURER := Google DEVICE_MANIFEST_FILE := \ device/google/pantah/manifest.xml -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_panther.mk b/aosp_panther.mk index 36a4cb1..92ac6ac 100644 --- a/aosp_panther.mk +++ b/aosp_panther.mk @@ -31,4 +31,8 @@ PRODUCT_MANUFACTURER := Google DEVICE_MANIFEST_FILE := \ device/google/pantah/manifest.xml -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