Do not enforce VNDK on GSI if VNDK version is not set
If ro.vndk.version is not defined, use the namespace configuration file that does not enforce VNDK restriction. This is only for GSI. Bug: 70704112 Test: Flash sailfish with PI and test with PI GSI image Change-Id: Ic2b41357905ef47a3483b2eff635e8ae239e28aa
This commit is contained in:
@@ -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
2
target/product/vndk/init.gsi.rc
Normal 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
3
target/product/vndk/init.noenforce.rc
Normal 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
|
Reference in New Issue
Block a user