ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Use apex/com.android.resolv/lib64/libned_resolv.so by default" am: 87e10ba280

Browse source 
am: 518bd1235c

Change-Id: If964c5c404e792eb59fb9164576b647b3cc7a5e2
This commit is contained in:
chenbruce 2018-12-06 23:21:44 -08:00 • committed by android-build-merger
commit 99c85bc053
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rootdir/etc/ld.config.txt
View file

@ -38,7 +38,8 @@ additional.namespaces = sphal,vndk,rs
###############################################################################
namespace.default.isolated = true
namespace.default.search.paths = /system/${LIB}
namespace.default.search.paths = /apex/com.android.resolv/${LIB}
namespace.default.search.paths += /system/${LIB}
namespace.default.search.paths += /%PRODUCT%/${LIB}
namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB}
@ -74,7 +75,8 @@ namespace.default.permitted.paths += /%PRODUCT_SERVICES%/priv-app
namespace.default.permitted.paths += /data
namespace.default.permitted.paths += /mnt/expand
namespace.default.asan.search.paths = /data/asan/system/${LIB}
namespace.default.asan.search.paths = /apex/com.android.resolv/${LIB}
namespace.default.asan.search.paths += /data/asan/system/${LIB}
namespace.default.asan.search.paths += /system/${LIB}
namespace.default.asan.search.paths += /data/asan/product/${LIB}
namespace.default.asan.search.paths += /%PRODUCT%/${LIB}

6
rootdir/etc/ld.config.vndk_lite.txt
View file

@ -38,13 +38,15 @@ additional.namespaces = sphal,vndk,rs
###############################################################################
namespace.default.isolated = false
namespace.default.search.paths = /system/${LIB}
namespace.default.search.paths = /apex/com.android.resolv/${LIB}
namespace.default.search.paths += /system/${LIB}
namespace.default.search.paths += /odm/${LIB}
namespace.default.search.paths += /vendor/${LIB}
namespace.default.search.paths += /%PRODUCT%/${LIB}
namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB}
namespace.default.asan.search.paths = /data/asan/system/${LIB}
namespace.default.asan.search.paths = /apex/com.android.resolv/${LIB}
namespace.default.asan.search.paths += /data/asan/system/${LIB}
namespace.default.asan.search.paths += /system/${LIB}
namespace.default.asan.search.paths += /data/asan/odm/${LIB}
namespace.default.asan.search.paths += /odm/${LIB}