openkylin
/
device_google_redfin
mirror of https://gitee.com/openkylin/device_google_redfin.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Daniel Norman 2020-10-06 11:28:17 -07:00
parent 90d266b300
commit 583ad117fd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aosp_redfin.mk
View File

@ -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