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

Commit 32697480 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

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

Merge "Revert "Use apex/com.android.resolv/lib64/libned_resolv.so by default"" am: 40f96aff am: aac7fa53
am: 432a55e4

Change-Id: Ic2c03f96a0a19c361748404146544ea3e36d55dc
parents 76295ff0 432a55e4

rootdir/etc/ld.config.txt

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

rootdir/etc/ld.config.vndk_lite.txt

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