commit a655dac726de2b2085700a4afe9456ac0ab302b7
author Nicolas Geoffray <ngeoffray@google.com> Fri Jan 11 15:59:42 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Jan 15 18:22:12 2019 +0000
tree 154ce5f902b2f087675a0230efb71b8a392ac69f
parent 4e88b78ac560858c663f452a9f691af0a60d4cc5

Move to C API of libnativeloader.

Test: m
Bug: 119840313
Change-Id: I11c44c46595cde768ee639e6c5a4cce1559e32f7

opengl/libs/EGL/egl_layers.cpp

diff --git a/opengl/libs/EGL/egl_layers.cpp b/opengl/libs/EGL/egl_layers.cpp
index dd8fbfc..f936ac0 100644
--- a/opengl/libs/EGL/egl_layers.cpp
+++ b/opengl/libs/EGL/egl_layers.cpp
@@ -375,12 +375,13 @@
                 auto app_namespace = android::GraphicsEnv::getInstance().getAppNamespace();
                 if (app_namespace && !android::base::StartsWith(layer, kSystemLayerLibraryDir)) {
                     bool native_bridge = false;
-                    std::string error_message;
-                    handle = OpenNativeLibrary(app_namespace, layer.c_str(), &native_bridge,
-                                               &error_message);
+                    char* error_message = nullptr;
+                    handle = OpenNativeLibraryInNamespace(
+                        app_namespace, layer.c_str(), &native_bridge, &error_message);
                     if (!handle) {
                         ALOGE("Failed to load layer %s with error: %s", layer.c_str(),
-                              error_message.c_str());
+                              error_message);
+                        android::NativeLoaderFreeErrorMessage(error_message);
                         return;
                     }