From 180e1e70534d3db22571c428bdbaff16a4ed5db3 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Sun, 20 Jun 2021 17:54:38 +0900 Subject: Fix link apex for jni libs When library_path is ":" splitted list of .jar files, we should iterate over each .jar file path to link a proper APEX namespace for JNI lib. Bug: 169826971 Test: libnativeloader_test Test: move libicing to appsearch apex Change-Id: I3df47203d336036d0e015f9c5421b30a0377087f --- libnativeloader/native_loader_test.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libnativeloader/native_loader_test.h') diff --git a/libnativeloader/native_loader_test.h b/libnativeloader/native_loader_test.h index cab18daed1..09c56e56f5 100644 --- a/libnativeloader/native_loader_test.h +++ b/libnativeloader/native_loader_test.h @@ -80,6 +80,11 @@ static std::unordered_map namespac NAMESPACE_ENTRY("com_android_i18n"), NAMESPACE_ENTRY("com_android_neuralnetworks"), NAMESPACE_ENTRY("com_android_art"), + + // TODO(b/191644631) This can be removed when the test becomes more test-friendly. + // This is added so that the test can exercise the JNI lib related behavior. + NAMESPACE_ENTRY("com_android_conscrypt"), + NAMESPACE_ENTRY("default"), NAMESPACE_ENTRY("sphal"), NAMESPACE_ENTRY("system"), -- cgit v1.2.3-59-g8ed1b