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

Merge "Revert "Use apex/com.android.resolv/lib64/libned_resolv.so by default""

Browse source 
am: 40f96aff36

Change-Id: I73a27d0f75fe0b3dc69ef2123d4180af1dac3dda
This commit is contained in:
Andreas Gampe 2018-12-07 20:43:27 -08:00 • committed by android-build-merger
commit aac7fa53d4
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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