diff options
| author | Yo Chiang <yochiang@google.com> | 2020-08-19 08:55:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-19 08:55:14 +0000 |
| commit | de1f0e03d7c3c419857220019015391d8ecf64ab (patch) | |
| tree | 1642e24b8c9141c1d3ef4552cd48317f5604d23c | |
| parent | 254c481ace2a4611853ec011daa0e975a72aaca2 (diff) | |
| parent | 3760d9cbeb3c92f24b8ce8d7167ec1950c8d1549 (diff) | |
| download | muskie-de1f0e03d7c3c419857220019015391d8ecf64ab.tar.gz | |
Use on_vendor VNDK APEX for non-REL build am: 3760d9cbeb
Original change: https://android-review.googlesource.com/c/device/google/muskie/+/1402447
Change-Id: I4bcc9ed7815989d1b528f9aef25f9d8c03d381cd
| -rw-r--r-- | aosp_walleye.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/aosp_walleye.mk b/aosp_walleye.mk index 7137bd9..9e29c47 100644 --- a/aosp_walleye.mk +++ b/aosp_walleye.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 |