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

Commit 055ded38 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "adapt ld.config.txt for vndk apex""

parents 0ce3a03b e23a2999

apex/ld.config.txt

+6 −4
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ namespace.sphal.asan.permitted.paths += /vendor/${LIB} 




namespace.sphal.search.paths += /odm/${LIB}/vndk-sp

namespace.sphal.search.paths += /odm/${LIB}/vndk-sp

namespace.sphal.search.paths += /vendor/${LIB}/vndk-sp

namespace.sphal.search.paths += /vendor/${LIB}/vndk-sp

namespace.sphal.search.paths += /apex/com.android.vndk.v${VNDK_VER}/${LIB}

namespace.sphal.search.paths += /system/${LIB}/vndk-sp${VNDK_VER}





namespace.sphal.permitted.paths += /odm/${LIB}/hw

namespace.sphal.permitted.paths += /odm/${LIB}/hw

namespace.sphal.permitted.paths += /odm/${LIB}/egl

namespace.sphal.permitted.paths += /odm/${LIB}/egl
@@ -97,13 +97,14 @@ namespace.sphal.permitted.paths += /vendor/${LIB}/egl 
namespace.sphal.permitted.paths += /system/vendor/${LIB}/hw

namespace.sphal.permitted.paths += /system/vendor/${LIB}/hw

namespace.sphal.permitted.paths += /system/vendor/${LIB}/egl

namespace.sphal.permitted.paths += /system/vendor/${LIB}/egl

# This is exceptionally required since android.hidl.memory@1.0-impl.so is here

# This is exceptionally required since android.hidl.memory@1.0-impl.so is here

namespace.sphal.permitted.paths += /apex/com.android.vndk.v${VNDK_VER}/${LIB}/hw

namespace.sphal.permitted.paths += /system/${LIB}/vndk-sp${VNDK_VER}/hw





namespace.sphal.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp

namespace.sphal.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp

namespace.sphal.asan.search.paths +=           /odm/${LIB}/vndk-sp

namespace.sphal.asan.search.paths +=           /odm/${LIB}/vndk-sp

namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp

namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp

namespace.sphal.asan.search.paths +=           /vendor/${LIB}/vndk-sp

namespace.sphal.asan.search.paths +=           /vendor/${LIB}/vndk-sp

namespace.sphal.asan.search.paths += /apex/com.android.vndk.v${VNDK_VER}/${LIB}

namespace.sphal.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER}

namespace.sphal.asan.search.paths +=           /system/${LIB}/vndk-sp${VNDK_VER}





namespace.sphal.asan.permitted.paths += /data/asan/odm/${LIB}/hw

namespace.sphal.asan.permitted.paths += /data/asan/odm/${LIB}/hw

namespace.sphal.asan.permitted.paths +=           /odm/${LIB}/hw

namespace.sphal.asan.permitted.paths +=           /odm/${LIB}/hw
@@ -114,7 +115,8 @@ namespace.sphal.asan.permitted.paths += /vendor/${LIB}/hw 
namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}/egl

namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}/egl

namespace.sphal.asan.permitted.paths +=           /vendor/${LIB}/egl

namespace.sphal.asan.permitted.paths +=           /vendor/${LIB}/egl





namespace.sphal.asan.permitted.paths += /apex/com.android.vndk.v${VNDK_VER}/${LIB}/hw

namespace.sphal.asan.permitted.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER}/hw

namespace.sphal.asan.permitted.paths +=           /system/${LIB}/vndk-sp${VNDK_VER}/hw





# Once in this namespace, access to libraries in /system/lib is restricted. Only

# Once in this namespace, access to libraries in /system/lib is restricted. Only

# libs listed here can be used.

# libs listed here can be used.