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

Commit deeedf97 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Search rs namespace prior to vndk namespace" am: 5ccb6a5c 

am: 8b524e9b

Change-Id: I50a3280e0fcd1dd30535c32479ca452f7f3f31f1
parents 2dfbda57 8b524e9b

rootdir/etc/ld.config.txt

+7 −5
Original line number Diff line number Diff line
@@ -253,17 +253,19 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} 
namespace.sphal.asan.permitted.paths +=           /vendor/${LIB}



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

# libs listed here can be used.

namespace.sphal.links = default,vndk,rs

# libs listed here can be used. Order is important here as the namespaces are

# tried in this order. rs should be before vndk because both are capable

# of loading libRS_internal.so

namespace.sphal.links = rs,default,vndk



# Renderscript gets separate namespace

namespace.sphal.link.rs.shared_libs = libRS_internal.so



namespace.sphal.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.sphal.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%



namespace.sphal.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES%



# Renderscript gets separate namespace

namespace.sphal.link.rs.shared_libs = libRS_internal.so



###############################################################################

# "rs" namespace

#

rootdir/etc/ld.config.vndk_lite.txt

+7 −5
Original line number Diff line number Diff line
@@ -195,17 +195,19 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} 
namespace.sphal.asan.permitted.paths +=           /vendor/${LIB}



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

# libs listed here can be used.

namespace.sphal.links = default,vndk,rs

# libs listed here can be used. Order is important here as the namespaces are

# tried in this order. rs should be before vndk because both are capable

# of loading libRS_internal.so

namespace.sphal.links = rs,default,vndk



# Renderscript gets separate namespace

namespace.sphal.link.rs.shared_libs = libRS_internal.so



namespace.sphal.link.default.shared_libs  = %LLNDK_LIBRARIES%

namespace.sphal.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%



namespace.sphal.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES%



# Renderscript gets separate namespace

namespace.sphal.link.rs.shared_libs = libRS_internal.so



###############################################################################

# "rs" namespace

#