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

Commit 76f35ab7 authored by Jooyung Han's avatar Jooyung Han Committed by android-build-merger
Browse files

Merge "Revert "adapt ld.config.txt for vndk apex"" am: 055ded38 am: 36f40f8d 

am: 5e42ca06

Change-Id: I7d3985da4891783a24cf6b6bee046bc47011943f
parents 35e234ff 5e42ca06

apex/ld.config.txt

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


namespace.sphal.search.paths += /odm/${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}/egl
@@ -99,13 +99,14 @@ namespace.sphal.permitted.paths += /vendor/${LIB}/egl 
namespace.sphal.permitted.paths += /system/vendor/${LIB}/hw

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

# 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 +=           /odm/${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 += /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 +=           /odm/${LIB}/hw
@@ -116,7 +117,8 @@ namespace.sphal.asan.permitted.paths += /vendor/${LIB}/hw 
namespace.sphal.asan.permitted.paths += /data/asan/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

# libs listed here can be used.