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

Merge "Do not enforce VNDK on GSI if VNDK version is not set" am: 98acb09033

Browse Source 
am: 9cd647af0c

Change-Id: I245bbe8e7a16deb42b84599691e581c504d4615c
This commit is contained in:
Justin Yun
2017-12-21 03:01:19 +00:00
committed by android-build-merger
parent a388e5c058 9cd647af0c
commit 9b64392eb6
3 changed files with 11 additions and 0 deletions
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