commit ab1e2ed84a0ac24e4cf694c1eb5312f870531626
author Nicolas Geoffray <ngeoffray@google.com> Wed Jan 16 20:20:27 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jan 16 21:40:34 2019 +0000
tree 8f7ca2a082ea12ac4ed63e5d101894c8be6679c3
parent 2cad6944f1ecb1233be436cd754875484d5a4083

libnativeloader: remove stubs for now.

Seems to break VMDebug test.

Also add missed strdup in returned error message.

bug: 122957265
Test: VMDebug
Change-Id: I64727d707f20c0e6afcb5455edf20c99011a81dc

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;
   }