commit af16bf4f5160c03c858b32c40900f07f1e9c0366
author Elliott Hughes <enh@google.com> Wed Jan 15 00:11:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 15 00:11:31 2014 +0000
tree 5c83fe1caf9666e420dff515351ebd7d2a323945
parent 7b80c1381581bd3c0c28440236e043888c49087d
parent 9c1cbe8373f28c9a6d6ba489af3e9247647dc469

am 9c1cbe83: am 53cd1484: am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."

* commit '9c1cbe8373f28c9a6d6ba489af3e9247647dc469':
  Don't set LD_LIBRARY_PATH globally.

rootdir/init.environ.rc.in

diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in
index d2f74c0..927c33d 100644
--- a/rootdir/init.environ.rc.in
+++ b/rootdir/init.environ.rc.in
@@ -1,7 +1,6 @@
 # set up the global environment
 on init
     export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
-    export LD_LIBRARY_PATH /vendor/lib:/system/lib
     export ANDROID_BOOTLOGO 1
     export ANDROID_ROOT /system
     export ANDROID_ASSETS /system/app