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

Commit 7a6fafb4 authored by Justin Yun's avatar Justin Yun Committed by android-build-merger
Browse files

Merge "Install ld.config.noenforce.txt instead of copying it" 

am: 37cc632f

Change-Id: I1cb7c34d8f4d8cd3d363b706a723fdfb6725c965
parents 759dcbd1 37cc632f

target/product/treble_common.mk

+6 −3
Original line number Diff line number Diff line
@@ -70,12 +70,15 @@ PRODUCT_PACKAGES += \ 
PRODUCT_COPY_FILES += \

    device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml



#GSI support for the devices that disable VNDK enforcing

# Support for the devices with no 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



# Name space configuration file for non-enforcing VNDK

PRODUCT_PACKAGES += \

    ld.config.noenforce.txt



# Set current VNDK version for GSI

PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \

    ro.gsi.vndk.version=$(PLATFORM_VNDK_VERSION)