summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorInseob Kim <inseob@google.com>2018-05-31 20:09:45 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-31 20:09:45 -0700
commitcf5e8f15759ea55877e77e58bf820738d9ec4a10 (patch)
treef8305539b36b30201f5d635b6c9c91f083ba5786 /rootdir
parent3206f10f8f0767e1bb1e8e3d61e19aa31d3b8048 (diff)
parent931e0f268a06206f34b4f5157942a13a8cfa77c3 (diff)
downloadsystem_core-cf5e8f15759ea55877e77e58bf820738d9ec4a10.tar.gz
system_core-cf5e8f15759ea55877e77e58bf820738d9ec4a10.tar.bz2
system_core-cf5e8f15759ea55877e77e58bf820738d9ec4a10.zip
Merge "Support /product/bin" am: 36b61f061d
am: 931e0f268a Change-Id: If507c7206c6e1c43e0fe5a6af411250b7879e2e3
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/etc/ld.config.txt1
-rw-r--r--rootdir/etc/ld.config.vndk_lite.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 51e3f9efc..a0b1996ad 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -7,6 +7,7 @@
# absolute path of an executable is selected.
dir.system = /system/bin/
dir.system = /system/xbin/
+dir.system = /product/bin/
dir.vendor = /odm/bin/
dir.vendor = /vendor/bin/
diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt
index ab0375539..db65c14fc 100644
--- a/rootdir/etc/ld.config.vndk_lite.txt
+++ b/rootdir/etc/ld.config.vndk_lite.txt
@@ -7,6 +7,7 @@
# absolute path of an executable is selected.
dir.system = /system/bin/
dir.system = /system/xbin/
+dir.system = /product/bin/
dir.vendor = /odm/bin/
dir.vendor = /vendor/bin/