Merge "Install ld.config.noenforce.txt instead of copying it" am: 37cc632f81

am: 7a6fafb42e

Change-Id: I8652310670652231d420e1f3bfadb7c30bc99986
This commit is contained in:
Justin Yun 2018-01-23 23:03:49 +00:00 committed by android-build-merger
commit 8801bd4cf7
1 changed files with 6 additions and 3 deletions

View File

@ -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
#Set current VNDK version for GSI
# 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)