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

Commit 52c5aafb authored by Jooyung Han's avatar Jooyung Han
Browse files

ld.config.txt: remove link from rs to vndk 

Linker namespace 'rs' has /system/lib/vndk-sp in its search paths.
So we don't need to link 'rs' namespace to 'vndk' namespace.

Bug: 139706981
Test: run RS-using apps from Play
Change-Id: I14c1d6c4e7624bbd6551731ea88de1b4c2e5edb6
parent 6b20b7cf

rootdir/etc/ld.config.txt

+1 −3
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} 
namespace.rs.asan.permitted.paths +=           /vendor/${LIB}

namespace.rs.asan.permitted.paths += /data



namespace.rs.links = default,vndk,neuralnetworks

namespace.rs.links = default,neuralnetworks



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

namespace.rs.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@@ -336,8 +336,6 @@ namespace.rs.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% 
# namespace because RS framework libs are using them.

namespace.rs.link.default.shared_libs += %PRIVATE_LLNDK_LIBRARIES%



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



# LLNDK library moved into apex

namespace.rs.link.neuralnetworks.shared_libs = libneuralnetworks.so

rootdir/etc/ld.config.vndk_lite.txt

+1 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} 
namespace.rs.asan.permitted.paths +=           /vendor/${LIB}

namespace.rs.asan.permitted.paths += /data



namespace.rs.links = default,vndk,neuralnetworks

namespace.rs.links = default,neuralnetworks



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

namespace.rs.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@@ -273,8 +273,6 @@ namespace.rs.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% 
# namespace because RS framework libs are using them.

namespace.rs.link.default.shared_libs += %PRIVATE_LLNDK_LIBRARIES%



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



# LLNDK library moved into apex

namespace.rs.link.neuralnetworks.shared_libs = libneuralnetworks.so