Merge "/vendor/lib/hw is removed from search paths for vendor default ns"

diff --cc rootdir/etc/ld.config.txt
index 1da93af,4cde56f..b86104d
--- 1/rootdir/etc/ld.config.txt
--- 2/rootdir/etc/ld.config.txt
+++ b/rootdir/etc/ld.config.txt
@@@ -258,23 -258,18 +258,18 @@@ namespace.default.search.paths += /syst
  namespace.default.search.paths += /system/${LIB}/vndk-sp${VNDK_VER}
  namespace.default.search.paths += /system/${LIB}
  
- # TODO(b/70551668) Remove /vendor/${LIB}/hw from search paths.
- # Shared libraries in the directory should be dlopened with full file paths.
- # This is a workaround for some legacy prebuilt binaries.
- namespace.default.search.paths += /vendor/${LIB}/hw
- 
- namespace.default.asan.search.paths += /data/asan/odm/${LIB}
+ namespace.default.asan.search.paths  = /data/asan/odm/${LIB}
  namespace.default.asan.search.paths +=           /odm/${LIB}
 -namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk${VNDK_VER}
 -namespace.default.asan.search.paths +=           /odm/${LIB}/vndk${VNDK_VER}
 -namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp${VNDK_VER}
 -namespace.default.asan.search.paths +=           /odm/${LIB}/vndk-sp${VNDK_VER}
 +namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk
 +namespace.default.asan.search.paths +=           /odm/${LIB}/vndk
 +namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp
 +namespace.default.asan.search.paths +=           /odm/${LIB}/vndk-sp
  namespace.default.asan.search.paths += /data/asan/vendor/${LIB}
  namespace.default.asan.search.paths +=           /vendor/${LIB}
 -namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk${VNDK_VER}
 -namespace.default.asan.search.paths +=           /vendor/${LIB}/vndk${VNDK_VER}
 -namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}
 -namespace.default.asan.search.paths +=           /vendor/${LIB}/vndk-sp${VNDK_VER}
 +namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk
 +namespace.default.asan.search.paths +=           /vendor/${LIB}/vndk
 +namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp
 +namespace.default.asan.search.paths +=           /vendor/${LIB}/vndk-sp
  namespace.default.asan.search.paths += /data/asan/system/${LIB}/vndk${VNDK_VER}
  namespace.default.asan.search.paths +=           /system/${LIB}/vndk${VNDK_VER}
  namespace.default.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER}

diff --cc rootdir/etc/ld.config.txt.in
index 77c2062,6fc088d..df26f90
--- 1/rootdir/etc/ld.config.txt.in
--- 2/rootdir/etc/ld.config.txt.in
+++ b/rootdir/etc/ld.config.txt.in
@@@ -234,35 -234,28 +234,28 @@@ namespace.default.isolated = tru
  namespace.default.visible = true
  
  namespace.default.search.paths  = /odm/${LIB}
 -namespace.default.search.paths += /odm/${LIB}/vndk${VNDK_VER}
 -namespace.default.search.paths += /odm/${LIB}/vndk-sp${VNDK_VER}
 +namespace.default.search.paths += /odm/${LIB}/vndk
 +namespace.default.search.paths += /odm/${LIB}/vndk-sp
  namespace.default.search.paths += /vendor/${LIB}
 -namespace.default.search.paths += /vendor/${LIB}/vndk${VNDK_VER}
 -namespace.default.search.paths += /vendor/${LIB}/vndk-sp${VNDK_VER}
 +namespace.default.search.paths += /vendor/${LIB}/vndk
 +namespace.default.search.paths += /vendor/${LIB}/vndk-sp
  
- # TODO(b/70551668) remove this
- namespace.default.search.paths += /vendor/${LIB}/hw
- 
  namespace.default.permitted.paths  = /odm
  namespace.default.permitted.paths += /vendor
  
  namespace.default.asan.search.paths  = /data/asan/odm/${LIB}
  namespace.default.asan.search.paths +=           /odm/${LIB}
 -namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk${VNDK_VER}
 -namespace.default.asan.search.paths +=           /odm/${LIB}/vndk${VNDK_VER}
 -namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp${VNDK_VER}
 -namespace.default.asan.search.paths +=           /odm/${LIB}/vndk-sp${VNDK_VER}
 +namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk
 +namespace.default.asan.search.paths +=           /odm/${LIB}/vndk
 +namespace.default.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp
 +namespace.default.asan.search.paths +=           /odm/${LIB}/vndk-sp
  namespace.default.asan.search.paths += /data/asan/vendor/${LIB}
  namespace.default.asan.search.paths +=           /vendor/${LIB}
 -namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk${VNDK_VER}
 -namespace.default.asan.search.paths +=           /vendor/${LIB}/vndk${VNDK_VER}
 -namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp${VNDK_VER}
 -namespace.default.asan.search.paths +=           /vendor/${LIB}/vndk-sp${VNDK_VER}
 +namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk
 +namespace.default.asan.search.paths +=           /vendor/${LIB}/vndk
 +namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp
 +namespace.default.asan.search.paths +=           /vendor/${LIB}/vndk-sp
  
- # TODO(b/70551668) remove this
- namespace.default.asan.search.paths += /data/asan/vendor/${LIB}/hw
- namespace.default.asan.search.paths +=           /vendor/${LIB}/hw
- 
  namespace.default.asan.permitted.paths  = /data/asan/odm
  namespace.default.asan.permitted.paths +=           /odm
  namespace.default.asan.permitted.paths += /data/asan/vendor