diff options
| -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 |