StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use current VNDK directories if version is not set on GSI"

Browse Source
This commit is contained in:
Treehugger Robot
2017-12-23 00:35:23 +00:00
committed by Gerrit Code Review
parent a6c3cece9e c104764f73
commit a5af4d920f
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/treble_common.mk
View File

@@ -87,3 +87,7 @@ PRODUCT_COPY_FILES += \
system/core/rootdir/etc/ld.config.txt:system/etc/ld.config.noenforce.txt \ 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.gsi.rc:system/etc/init/init.gsi.rc \
build/make/target/product/vndk/init.noenforce.rc:system/etc/init/gsi/init.noenforce.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)

2
target/product/vndk/init.noenforce.rc
View File

@@ -1,3 +1,5 @@
on early-init on early-init
# If ro.vndk.version is not set, use ld.config.nonenforce.txt # If ro.vndk.version is not set, use ld.config.nonenforce.txt
export LD_CONFIG_FILE /system/etc/ld.config.noenforce.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}