From 583ad117fd613ab047a179a2cb7ed354bb6e91c8 Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Tue, 6 Oct 2020 11:28:17 -0700 Subject: [PATCH] Stops using VNDK-current on vendor for vendor-freeze system builds. VNDK-current on vendor is not supported for Android R. When creating a merged S-system R-vendor build, VNDK-current needs to come from the system build. Bug: 169968221 Test: Build and merge a vendor-freeze S system R vendor build. Observe VNDK current apex on /system. Device boots. Change-Id: I6baaed10fb83f24c1141f454052a1ac543c60914 --- aosp_redfin.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/aosp_redfin.mk b/aosp_redfin.mk index d633bae..6844c9f 100644 --- a/aosp_redfin.mk +++ b/aosp_redfin.mk @@ -49,11 +49,13 @@ $(call inherit-product-if-exists, vendor/google_devices/redfin/prebuilts/device- PRODUCT_COPY_FILES += \ frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml -# Keep the VNDK APEX in /system partition for REL branches as these branches are -# expected to have stable API/ABI surfaces. +# Keep the VNDK APEX in /system partition for REL branches and Vendor Freeze targets +# as these are expected to have stable API/ABI surfaces. ifneq (REL,$(PLATFORM_VERSION_CODENAME)) +ifneq ($(PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD),true) PRODUCT_PACKAGES += com.android.vndk.current.on_vendor endif +endif # Don't build super.img. PRODUCT_BUILD_SUPER_PARTITION := false