mirror of
https://github.com/Evolution-X-Devices/device_google_redfin
synced 2026-02-01 11:26:33 +00:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user