commit 336db836637a95d0f6f79a3ffba79f7c7eeb9543
author Jesse Hall <jessehall@google.com> Thu Jan 31 22:04:02 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 31 22:04:02 2019 -0800
tree dc9dda52a05ce154c6c58017d540d53ce87de88e
parent 8127cc509fe251ff467dd277303a3996c932890d
parent af048aa0bbc2b5df602aa52bfc2ba11588087305

Merge "Search/permit /vendor/${LIB}/hw in sphal namespace" am: afc2ac106a
am: e9e72c0a04

Change-Id: Icadbd8b97f4dd194bfbf0acf3d42c52e993b5e7f

rootdir/etc/ld.config.txt

diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt
index 582ce27..9bf9058 100644
--- a/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@ -216,6 +216,7 @@
 
 namespace.sphal.search.paths  = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
+namespace.sphal.search.paths += /vendor/${LIB}/hw
 
 namespace.sphal.permitted.paths  = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}

rootdir/etc/ld.config.vndk_lite.txt

diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt
index d0bdf3a..ca180c0 100644
--- a/rootdir/etc/ld.config.vndk_lite.txt
+++ b/rootdir/etc/ld.config.vndk_lite.txt
@@ -164,6 +164,7 @@
 
 namespace.sphal.search.paths  = /odm/${LIB}
 namespace.sphal.search.paths += /vendor/${LIB}
+namespace.sphal.search.paths += /vendor/${LIB}/hw
 
 namespace.sphal.permitted.paths  = /odm/${LIB}
 namespace.sphal.permitted.paths += /vendor/${LIB}