Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move to C API of libnativeloader."

Browse Source 
am: 9bc4066ba3

Change-Id: I402edc150c0031a284c15da684494c5773581978
This commit is contained in:
Nicolas Geoffray
2019-01-16 07:20:46 -08:00
committed by android-build-merger
parent 7925837b5a 9bc4066ba3
commit 634d1e1f10
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android_app_NativeActivity.cpp
View File

@@ -281,15 +281,18 @@ loadNativeCode_native(JNIEnv* env, jobject clazz, jstring path, jstring funcName
std::unique_ptr<NativeCode> code; std::unique_ptr<NativeCode> code;
bool needs_native_bridge = false; bool needs_native_bridge = false;
char* nativeloader_error_msg = nullptr;
void* handle = OpenNativeLibrary(env, void* handle = OpenNativeLibrary(env,
sdkVersion, sdkVersion,
pathStr.c_str(), pathStr.c_str(),
classLoader, classLoader,
libraryPath, libraryPath,
&needs_native_bridge, &needs_native_bridge,
&g_error_msg); &nativeloader_error_msg);
if (handle == nullptr) { if (handle == nullptr) {
g_error_msg = nativeloader_error_msg;
NativeLoaderFreeErrorMessage(nativeloader_error_msg);
ALOGW("NativeActivity LoadNativeLibrary(\"%s\") failed: %s", ALOGW("NativeActivity LoadNativeLibrary(\"%s\") failed: %s",
pathStr.c_str(), pathStr.c_str(),
g_error_msg.c_str()); g_error_msg.c_str());