Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99c85bc0 authored by chenbruce's avatar chenbruce Committed by android-build-merger
Browse files

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

am: 518bd123

Change-Id: If964c5c404e792eb59fb9164576b647b3cc7a5e2
parents b01f722d 518bd123

rootdir/etc/ld.config.txt

+4 −2
Original line number Diff line number Diff line
@@ -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}

rootdir/etc/ld.config.vndk_lite.txt

+4 −2
Original line number Diff line number Diff line
@@ -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}