diff options
| author | Yo Chiang <yochiang@google.com> | 2020-08-19 08:55:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-19 08:55:15 +0000 |
| commit | f15eed20658fc146a79a399ace7b85d54669f7de (patch) | |
| tree | 9ce218ee2149d8d11aafa1002b5850b0dbf9f817 | |
| parent | cb7455c1f603cfa2344d49328e9748d8d843ddb4 (diff) | |
| parent | 038066f517d09960e4b7ea13dd514286837091fe (diff) | |
| download | taimen-f15eed20658fc146a79a399ace7b85d54669f7de.tar.gz | |
Use on_vendor VNDK APEX for non-REL build am: 038066f517
Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1402427
Change-Id: Ic9a92346b22120e3ba5e9c98b11b0b29b9986368
| -rw-r--r-- | aosp_taimen.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/aosp_taimen.mk b/aosp_taimen.mk index ced8b52..35e547f 100644 --- a/aosp_taimen.mk +++ b/aosp_taimen.mk @@ -35,7 +35,11 @@ PRODUCT_COPY_FILES += \ PRODUCT_RESTRICT_VENDOR_FILES := owner -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 PRODUCT_MANUFACTURER := Google PRODUCT_BRAND := Android |