diff options
| author | Yo Chiang <yochiang@google.com> | 2020-08-17 11:24:16 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2024-01-04 05:40:50 +0800 |
| commit | 8218d6599d02be0049f0f76a82a1fcd2215b077c (patch) | |
| tree | c3332bca8976b071e7a4c24bfdcfc4b5c3998dab | |
| parent | 1ee88ffbc1fa52a2a0657e54baa5589c28ebba41 (diff) | |
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
| -rw-r--r-- | aosp_cheetah.mk | 6 | ||||
| -rw-r--r-- | 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 |