commit 5b578127c6c1b373aa0eecfa13737e5bf66f7b9f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 17 00:56:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 17 00:56:38 2019 +0000
tree 763e99318c58d055d44069562429e4731d527933
parent 9e8cafa95e40d8b213f0953e84abe158874f9017
parent ab1e2ed84a0ac24e4cf694c1eb5312f870531626

Merge "libnativeloader: remove stubs for now."

libnativeloader/Android.bp

diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 8903b72..2802d36 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -23,15 +23,6 @@
         "llndk.libraries.txt",
         "vndksp.libraries.txt",
     ],
-    target: {
-        android: {
-            version_script: "libnativeloader.map.txt",
-        },
-    },
-    stubs: {
-        symbol_file: "libnativeloader.map.txt",
-        versions: ["1"],
-    },
 }
 
 cc_library_headers {

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index f231afa..af7df72 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -632,7 +632,7 @@
     *needs_native_bridge = false;
     void* handle = dlopen(path, RTLD_NOW);
     if (handle == nullptr) {
-      *error_msg = dlerror();
+      *error_msg = strdup(dlerror());
     }
     return handle;
   }