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

This commit is contained in:
Treehugger Robot 2018-12-08 04:36:35 +00:00 committed by Gerrit Code Review
commit 40f96aff36
2 changed files with 4 additions and 8 deletions

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}

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}