From d831773ec698cdf639ee97a7e1a6da9ffd393279 Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Fri, 7 Dec 2018 21:46:06 +0000
Subject: [PATCH] Revert "Use apex/com.android.resolv/lib64/libned_resolv.so by
 default"

This reverts commit eb4384c2a0374e7f77d2b494ec408514c7276714.

Reason for revert: Breaks tests

Bug: 119527674
Bug: 120661824
Change-Id: I2f452f25e7b4e070e766b84cdefdf1800244b150
Test: N/A
---
 rootdir/etc/ld.config.txt           | 6 ++----
 rootdir/etc/ld.config.vndk_lite.txt | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index de316297f..d3e80c992 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -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}
diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt
index 21d36422c..7e354aca6 100644
--- a/rootdir/etc/ld.config.vndk_lite.txt
+++ b/rootdir/etc/ld.config.vndk_lite.txt
@@ -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}