tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Do not enforce VNDK on GSI if VNDK version is not set"

Browse source
This commit is contained in:
Treehugger Robot 2017-12-20 23:25:23 +00:00 committed by Gerrit Code Review
commit 98acb09033
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/product/treble_common.mk
View file

@ -81,3 +81,9 @@ ifeq ($(BOARD_AVB_ENABLE),true)
$(error BOARD_AVB_ENABLE cannot be set for Treble GSI)
endif
BOARD_BUILD_DISABLED_VBMETAIMAGE := true
#GSI support for the devices that disable VNDK enforcing
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

2
target/product/vndk/init.gsi.rc Normal file
View file

@ -0,0 +1,2 @@
# If ro.vndk.version is not defined, import init.noenforce.rc
import /system/etc/init/gsi/init.${ro.vndk.version:-noenforce}.rc

3
target/product/vndk/init.noenforce.rc Normal file
View file

@ -0,0 +1,3 @@
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