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

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

Merge "Add VNDK APEX path as permitted paths of sphal" am: 835742ef am: 50975beb 

am: 94f4b7a4

Change-Id: I60424bc70f898ae28c3824ba9d25759e70df9c01
parents 934e6199 94f4b7a4

apex/ld.config.txt

+7 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ namespace.platform.search.paths += /apex/com.android.runtime/${LIB} 
namespace.platform.asan.search.paths += /apex/com.android.runtime/${LIB}



# /system/lib/libc.so, etc are symlinks to /apex/com.android.lib/lib/bionic/libc.so, etc.

# Add /apex/... pat to the permitted paths because linker uses realpath(3)

# Add /apex/... path to the permitted paths because linker uses realpath(3)

# to check the accessibility of the lib. We could add this to search.paths

# instead but that makes the resolution of bionic libs be dependent on

# the order of /system/lib and /apex/... in search.paths. If /apex/...
@@ -136,3 +136,9 @@ namespace.sphal.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2. 


# Add a link for libz.so which is llndk on devices where VNDK is not enforced.

namespace.sphal.link.platform.shared_libs += libz.so



# With VNDK APEX, /system/${LIB}/vndk-sp${VNDK_VER} is a symlink to the following.

# Add /apex/... path to the permitted paths because linker uses realpath(3)

# to check the accessibility of the lib.

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

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