summaryrefslogtreecommitdiff
path: root/libnativeloader/native_loader_test.h
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2021-06-20 17:54:38 +0900
committer Treehugger Robot <treehugger-gerrit@google.com> 2021-06-21 20:00:10 +0000
commit180e1e70534d3db22571c428bdbaff16a4ed5db3 (patch)
tree3f68563630f93ec1aef4298da18b04ca4d73e5f9 /libnativeloader/native_loader_test.h
parent1ff9056b87705e251501ea4d19280a7e4fe2d009 (diff)
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
Diffstat (limited to 'libnativeloader/native_loader_test.h')
-rw-r--r--libnativeloader/native_loader_test.h5
1 files changed, 5 insertions, 0 deletions
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<std::string, Platform::mock_namespace_handle> 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"),