commit c7b3d16a85cfde909d710e0be15662970fcdc59f
author Justin Yun <justinyun@google.com> Tue Jan 23 23:06:27 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 23 23:06:27 2018 +0000
tree 4de3861f0ce036b01fbb943eab30027181e4f7c2
parent 06c7f0db25f4a15b13ec7ef8819956ef0afca156
parent 8801bd4cf78b69e7fa0aca7bf18d60504215587c

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

Change-Id: I0f0543d5de53093565f0ce8b556edefc54ae9817

target/product/treble_common.mk

diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index 32ed473..cd5442f 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -66,12 +66,15 @@
 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)