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

Commit 98acb090 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 8950c2bb fc951ff2
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
# If ro.vndk.version is not defined, import init.noenforce.rc
import /system/etc/init/gsi/init.${ro.vndk.version:-noenforce}.rc
+3 −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