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

Commit 99457ff3 authored by Jooyung Han's avatar Jooyung Han
Browse files

adapt ld.config.txt for vndk apex 

With VNDK APEX, the path to VNDK libs is changed from
/system/lib/vndk-VER to /apex/com.android.vndk.vVER/lib.

Bug: 141451661
Test: m && boot (tested with cuttlefish)
Change-Id: Id3a335ad1dfea71fb53ce80b96d550af8ac61760
parent ba14ba2b

apex/ld.config.txt

+4 −6
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 += /system/${LIB}/vndk-sp${VNDK_VER}

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





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,14 +97,13 @@ 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 += /system/${LIB}/vndk-sp${VNDK_VER}/hw

namespace.sphal.permitted.paths += /apex/com.android.vndk.v${VNDK_VER}/${LIB}/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 += /data/asan/system/${LIB}/vndk-sp${VNDK_VER}

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

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
@@ -115,8 +114,7 @@ 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 += /data/asan/system/${LIB}/vndk-sp${VNDK_VER}/hw

namespace.sphal.asan.permitted.paths += /apex/com.android.vndk.v${VNDK_VER}/${LIB}/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.