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

Commit 2dae6f03 authored by Anton Hansson's avatar Anton Hansson
Browse files

Fix asan paths in ld.config 

As of Id663c5f284e3b4fc65ed8cb8c2da6bcf6542e034, the asan libs
are in the TARGET_COPY_OUT_X subpath of the /data/asan/ dir, rather
than just 'x' unconditionally.

Test: presubmit
Change-Id: I3a515791e237ad10703415ea532c7a089660d8e9
parent 59a01499

rootdir/etc/ld.config.txt

+2 −2
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ namespace.default.permitted.paths += /system/${LIB}/bootstrap 


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 += /data/asan/%PRODUCT%/${LIB}

namespace.default.asan.search.paths +=           /%PRODUCT%/${LIB}

namespace.default.asan.search.paths += /data/asan/product_services/${LIB}

namespace.default.asan.search.paths += /data/asan/%PRODUCT_SERVICES%/${LIB}

namespace.default.asan.search.paths +=           /%PRODUCT_SERVICES%/${LIB}



namespace.default.asan.permitted.paths  = /data

rootdir/etc/ld.config.vndk_lite.txt

+2 −2
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ namespace.default.asan.search.paths += /data/asan/odm/${LIB} 
namespace.default.asan.search.paths +=           /odm/${LIB}

namespace.default.asan.search.paths += /data/asan/vendor/${LIB}

namespace.default.asan.search.paths +=           /vendor/${LIB}

namespace.default.asan.search.paths += /data/asan/product/${LIB}

namespace.default.asan.search.paths += /data/asan/%PRODUCT%/${LIB}

namespace.default.asan.search.paths +=           /%PRODUCT%/${LIB}

namespace.default.asan.search.paths += /data/asan/product_services/${LIB}

namespace.default.asan.search.paths += /data/asan/%PRODUCT_SERVICES%/${LIB}

namespace.default.asan.search.paths +=           /%PRODUCT_SERVICES%/${LIB}



# Keep in sync with the platform namespace in the com.android.runtime APEX