diff options
| author | Yo Chiang <yochiang@google.com> | 2020-08-17 11:31:59 +0800 |
|---|---|---|
| committer | Yo Chiang <yochiang@google.com> | 2020-08-17 11:41:38 +0800 |
| commit | 3760d9cbeb3c92f24b8ce8d7167ec1950c8d1549 (patch) | |
| tree | 1642e24b8c9141c1d3ef4552cd48317f5604d23c | |
| parent | 4223d690c041237cdac19a9d773a92a5f47fd4a6 (diff) | |
| download | muskie-3760d9cbeb3c92f24b8ce8d7167ec1950c8d1549.tar.gz | |
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: I9c19181c0a8d47b2803d00c084a3ce66900b79da
| -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 |