From d93868102c72e9efb4400e6898136fa50780b451 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 12 Sep 2019 20:47:53 +0200
Subject: [PATCH] Stop setting LD_CONFIG_FILE, with apex, multiple config files
 might be used. Instead use bionic overload from ro.vndk.version

---
 vndk.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vndk.rc b/vndk.rc
index 135ccd7..cdcb0c5 100644
--- a/vndk.rc
+++ b/vndk.rc
@@ -2,7 +2,7 @@ on post-fs
 	exec - root -- /system/bin/vndk-detect
 	exec - root -- /system/bin/rw-system.sh
 	mount none /system/etc/usb_audio_policy_configuration.xml /vendor/etc/usb_audio_policy_configuration.xml bind
-	export LD_CONFIG_FILE /system/etc/ld.config.${persist.sys.vndk}.txt
+        setprop ro.vndk.version ${persist.sys.vndk}
 
 service phh_on_boot /system/bin/phh-on-boot.sh
     oneshot