diff options
| author | Martin Stjernholm <mast@google.com> | 2021-03-30 22:35:24 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-06-09 17:02:36 +0100 |
| commit | 8d81795749741f7269e028a738ef38215d6ae552 (patch) | |
| tree | f582fa4375288a14d1ae97c6a1d89d21c8ee8e49 /libnativeloader/native_loader_lazy.cpp | |
| parent | 5602ad7fc2f7eabd7677adc2984fce03e35e011a (diff) | |
Avoid internal APEX stubs in libnative{bridge,loader} and clean up
exported symbols.
The APEX stubs don't have any practical effect on the lazy loading
library wrappers. Add notes about that and update the function wrappers
to keep them in sync.
Also add tests for the lazy libraries. That necessitated some
reshuffling in libnativeloader tests to reuse the mocks.
Cherry-picked from https://r.android.com/1678729.
Test: art/libnativebridge/tests/runtests.sh
Test: atest libnativebridge-lazy-tests
Test: atest libnativeloader_test libnativeloader_lazy_test
Bug: 122710865
Change-Id: I7e291f2e84d8e35731dfb1114c9b19978ff87969
Merged-In: I7e291f2e84d8e35731dfb1114c9b19978ff87969
Diffstat (limited to 'libnativeloader/native_loader_lazy.cpp')
| -rw-r--r-- | libnativeloader/native_loader_lazy.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libnativeloader/native_loader_lazy.cpp b/libnativeloader/native_loader_lazy.cpp index 49b22ea848..5b82d00560 100644 --- a/libnativeloader/native_loader_lazy.cpp +++ b/libnativeloader/native_loader_lazy.cpp @@ -44,11 +44,6 @@ FuncPtr GetFuncPtr(const char* function_name) { } // namespace -void InitializeNativeLoader() { - static auto f = GET_FUNC_PTR(InitializeNativeLoader); - return f(); -} - jstring CreateClassLoaderNamespace(JNIEnv* env, int32_t target_sdk_version, jobject class_loader, bool is_shared, jstring dex_path, jstring library_path, jstring permitted_path, jstring uses_library_list) { @@ -92,11 +87,6 @@ void* OpenNativeLibraryInNamespace(struct NativeLoaderNamespace* ns, const char* return f(ns, path, needs_native_bridge, error_msg); } -void ResetNativeLoader() { - static auto f = GET_FUNC_PTR(ResetNativeLoader); - return f(); -} - #undef GET_FUNC_PTR } // namespace android |