diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 1da93afbc..b86104d38 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -258,12 +258,7 @@ namespace.default.search.paths += /system/${LIB}/vndk${VNDK_VER} 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 namespace.default.asan.search.paths += /odm/${LIB}/vndk @@ -281,9 +276,3 @@ namespace.default.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VE namespace.default.asan.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} namespace.default.asan.search.paths += /data/asan/system/${LIB} namespace.default.asan.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.asan.search.paths += /data/asan/vendor/${LIB}/hw -namespace.default.asan.search.paths += /vendor/${LIB}/hw diff --git a/rootdir/etc/ld.config.txt.in b/rootdir/etc/ld.config.txt.in index 77c206256..df26f9077 100644 --- a/rootdir/etc/ld.config.txt.in +++ b/rootdir/etc/ld.config.txt.in @@ -240,9 +240,6 @@ namespace.default.search.paths += /vendor/${LIB} 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 @@ -259,10 +256,6 @@ 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