Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 483cd2e2 authored by Jiyong Park's avatar Jiyong Park
Browse files

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

Shared libraries in the directory should be dlopened with full file
paths. That was a workaround for some legacy prebuilt binaries and they
are all now fixed. Thus removing.

Bug: 70551668
Test: walleye, aosp_walleye, taimen, aosp_taimen boot to the UI

Change-Id: Ifb123b09c13f873cbefa7784e76dfe5f35575a8d
parent 742fc190

rootdir/etc/ld.config.txt

+1 −12
Original line number Diff line number Diff line
@@ -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${VNDK_VER}

namespace.default.asan.search.paths +=           /odm/${LIB}/vndk${VNDK_VER}
@@ -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

rootdir/etc/ld.config.txt.in

+0 −7
Original line number Diff line number Diff line
@@ -240,9 +240,6 @@ 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}



# 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${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}



# 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