commit 9cd0c702e487e31566bb3c5f1bba8a952466dd9b
author Nicolas Geoffray <ngeoffray@google.com> Fri Jan 11 15:58:08 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jan 16 13:32:32 2019 +0000
tree d3c70864bade744d438cf8dca93c12a94d0acf30
parent 796c9446f77db52baa62e0bfaba2253a7aa46c49

Move to C API of libnativeloader.

Test: m
Bug: 119840313

Merged-In: Ia2ba3e4ed69d35310838ed57e03dfc122c3579db
(cherry picked from commit 42b30e7a2fba04365700b1b69aa149ec48dff29f)

Change-Id: Ic357031086b80442b5d3e249fb4fe26b8202ba63

core/jni/android_app_NativeActivity.cpp

diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp
index 49a24a3..b2d3651 100644
--- a/core/jni/android_app_NativeActivity.cpp
+++ b/core/jni/android_app_NativeActivity.cpp
@@ -281,15 +281,18 @@
     std::unique_ptr<NativeCode> code;
     bool needs_native_bridge = false;
 
+    char* nativeloader_error_msg = nullptr;
     void* handle = OpenNativeLibrary(env,
                                      sdkVersion,
                                      pathStr.c_str(),
                                      classLoader,
                                      libraryPath,
                                      &needs_native_bridge,
-                                     &g_error_msg);
+                                     &nativeloader_error_msg);
 
     if (handle == nullptr) {
+        g_error_msg = nativeloader_error_msg;
+        NativeLoaderFreeErrorMessage(nativeloader_error_msg);
         ALOGW("NativeActivity LoadNativeLibrary(\"%s\") failed: %s",
               pathStr.c_str(),
               g_error_msg.c_str());