Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c104764f authored by Justin Yun's avatar Justin Yun
Browse files

Use current VNDK directories if version is not set on GSI 

Only for GSI, if "ro.vndk.version" property is not defined, the
vendor modules will use current version of VNDK libs.

Bug: 70704112
Test: On Android-P sailfish device, install GSI and check boot
Change-Id: Ib8eb28604ab3e33474179dffbc07358921e7439c
parent 1d87b803

target/product/treble_common.mk

+4 −0
Original line number Diff line number Diff line
@@ -87,3 +87,7 @@ PRODUCT_COPY_FILES += \ 
    system/core/rootdir/etc/ld.config.txt:system/etc/ld.config.noenforce.txt \

    build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc \

    build/make/target/product/vndk/init.noenforce.rc:system/etc/init/gsi/init.noenforce.rc



#Set current VNDK version for GSI

PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \

    ro.gsi.vndk.version=$(PLATFORM_VNDK_VERSION)

target/product/vndk/init.noenforce.rc

+2 −0
Original line number Diff line number Diff line 
on early-init

    # If ro.vndk.version is not set, use ld.config.nonenforce.txt

    export LD_CONFIG_FILE /system/etc/ld.config.noenforce.txt

    # To use current VNDK libs, set ro.vndk.version to system vndk version

    setprop ro.vndk.version ${ro.gsi.vndk.version}