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

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

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

am: 059b8dac

Change-Id: I647b726e70d2c0710b45b15f1bad08ebe2524b19
parents 21fd368d 059b8dac

rootdir/etc/ld.config.txt

+1 −3
Original line number Diff line number Diff line
@@ -329,7 +329,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%
@@ -337,8 +337,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