diff options
author | Logan Chien | 2018-01-11 06:00:37 -0600 |
---|---|---|
committer | Logan Chien | 2018-01-21 21:30:56 -0600 |
commit | 91b3fb4f3f172d1c314415d7b05873872951e08c (patch) | |
tree | 1c0f4a9070b187ad58b8e8d86072ea05f06cbfa7 | |
parent | 0ba2c9f4a242570b416a2814818787a4d29d3f19 (diff) | |
download | platform-system-core-91b3fb4f3f172d1c314415d7b05873872951e08c.tar.gz platform-system-core-91b3fb4f3f172d1c314415d7b05873872951e08c.tar.xz platform-system-core-91b3fb4f3f172d1c314415d7b05873872951e08c.zip |
ld.config.txt: Move vendor vndk to vndk namespace
This commit moves /{odm,vendor}/lib[64]/vndk[-sp] to vndk namespace so
that vndk extension can override vndk libs from
/system/lib[64]/vndk[-sp].
Bug: 69824336
Test: Create libutils_ext locally and it can be called from
android.hardware.nfc@1.0-service.
Change-Id: Id63e58d665fa41eda85950ee1d16fe06c35cd7d3
-rw-r--r-- | rootdir/etc/ld.config.txt.in | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/rootdir/etc/ld.config.txt.in b/rootdir/etc/ld.config.txt.in index cad09c3ff..2a801fad8 100644 --- a/rootdir/etc/ld.config.txt.in +++ b/rootdir/etc/ld.config.txt.in | |||
@@ -234,27 +234,15 @@ namespace.default.isolated = true | |||
234 | namespace.default.visible = true | 234 | namespace.default.visible = true |
235 | 235 | ||
236 | namespace.default.search.paths = /odm/${LIB} | 236 | namespace.default.search.paths = /odm/${LIB} |
237 | namespace.default.search.paths += /odm/${LIB}/vndk | ||
238 | namespace.default.search.paths += /odm/${LIB}/vndk-sp | ||
239 | namespace.default.search.paths += /vendor/${LIB} | 237 | namespace.default.search.paths += /vendor/${LIB} |
240 | namespace.default.search.paths += /vendor/${LIB}/vndk | ||
241 | namespace.default.search.paths += /vendor/${LIB}/vndk-sp | ||
242 | 238 | ||
243 | namespace.default.permitted.paths = /odm | 239 | namespace.default.permitted.paths = /odm |
244 | namespace.default.permitted.paths += /vendor | 240 | namespace.default.permitted.paths += /vendor |
245 | 241 | ||
246 | namespace.default.asan.search.paths = /data/asan/odm/${LIB} | 242 | namespace.default.asan.search.paths = /data/asan/odm/${LIB} |
247 | namespace.default.asan.search.paths += /odm/${LIB} | 243 | namespace.default.asan.search.paths += /odm/${LIB} |
248 | namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk | ||
249 | namespace.default.asan.search.paths += /odm/${LIB}/vndk | ||
250 | namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp | ||
251 | namespace.default.asan.search.paths += /odm/${LIB}/vndk-sp | ||
252 | namespace.default.asan.search.paths += /data/asan/vendor/${LIB} | 244 | namespace.default.asan.search.paths += /data/asan/vendor/${LIB} |
253 | namespace.default.asan.search.paths += /vendor/${LIB} | 245 | namespace.default.asan.search.paths += /vendor/${LIB} |
254 | namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk | ||
255 | namespace.default.asan.search.paths += /vendor/${LIB}/vndk | ||
256 | namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp | ||
257 | namespace.default.asan.search.paths += /vendor/${LIB}/vndk-sp | ||
258 | 246 | ||
259 | namespace.default.asan.permitted.paths = /data/asan/odm | 247 | namespace.default.asan.permitted.paths = /data/asan/odm |
260 | namespace.default.asan.permitted.paths += /odm | 248 | namespace.default.asan.permitted.paths += /odm |
@@ -274,10 +262,22 @@ namespace.default.link.vndk.shared_libs += %VNDK_CORE_LIBRARIES% | |||
274 | ############################################################################### | 262 | ############################################################################### |
275 | namespace.vndk.isolated = false | 263 | namespace.vndk.isolated = false |
276 | 264 | ||
277 | namespace.vndk.search.paths = /system/${LIB}/vndk-sp%VNDK_VER% | 265 | namespace.vndk.search.paths = /odm/${LIB}/vndk |
266 | namespace.vndk.search.paths += /odm/${LIB}/vndk-sp | ||
267 | namespace.vndk.search.paths += /vendor/${LIB}/vndk | ||
268 | namespace.vndk.search.paths += /vendor/${LIB}/vndk-sp | ||
269 | namespace.vndk.search.paths += /system/${LIB}/vndk-sp%VNDK_VER% | ||
278 | namespace.vndk.search.paths += /system/${LIB}/vndk%VNDK_VER% | 270 | namespace.vndk.search.paths += /system/${LIB}/vndk%VNDK_VER% |
279 | 271 | ||
280 | namespace.vndk.asan.search.paths = /data/asan/system/${LIB}/vndk-sp%VNDK_VER% | 272 | namespace.vndk.asan.search.paths = /data/asan/odm/${LIB}/vndk |
273 | namespace.vndk.asan.search.paths += /odm/${LIB}/vndk | ||
274 | namespace.vndk.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp | ||
275 | namespace.vndk.asan.search.paths += /odm/${LIB}/vndk-sp | ||
276 | namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk | ||
277 | namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk | ||
278 | namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp | ||
279 | namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk-sp | ||
280 | namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk-sp%VNDK_VER% | ||
281 | namespace.vndk.asan.search.paths += /system/${LIB}/vndk-sp%VNDK_VER% | 281 | namespace.vndk.asan.search.paths += /system/${LIB}/vndk-sp%VNDK_VER% |
282 | namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk%VNDK_VER% | 282 | namespace.vndk.asan.search.paths += /data/asan/system/${LIB}/vndk%VNDK_VER% |
283 | namespace.vndk.asan.search.paths += /system/${LIB}/vndk%VNDK_VER% | 283 | namespace.vndk.asan.search.paths += /system/${LIB}/vndk%VNDK_VER% |