summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2017-02-02 15:19:24 -0600
committerGerrit Code Review2017-02-02 15:19:25 -0600
commit3dfe40129657165f4cfe6c6cf0a5b6c8e8e6d4da (patch)
tree29b661f3215f9e8dc15516fe90f104d1dcbd48e0
parentd85cf0fb7ded4001ae5a342d058dfa5e2e272eab (diff)
parente7005979c2ba01e13d75df218c0bc07ea71a479b (diff)
downloadplatform-system-core-3dfe40129657165f4cfe6c6cf0a5b6c8e8e6d4da.tar.gz
platform-system-core-3dfe40129657165f4cfe6c6cf0a5b6c8e8e6d4da.tar.xz
platform-system-core-3dfe40129657165f4cfe6c6cf0a5b6c8e8e6d4da.zip
Merge changes I321e2193,I1da92e2b
* changes: dlext_namespace.h: Declare android_get_LD_LIBRARY_PATH Make dlext_namespaces.h available to users of libnativeloader
-rw-r--r--libnativeloader/include/nativeloader/dlext_namespaces.h (renamed from libnativeloader/dlext_namespaces.h)13
-rw-r--r--libnativeloader/native_loader.cpp2
2 files changed, 14 insertions, 1 deletions
diff --git a/libnativeloader/dlext_namespaces.h b/libnativeloader/include/nativeloader/dlext_namespaces.h
index 13a44e2bf..02e7075d7 100644
--- a/libnativeloader/dlext_namespaces.h
+++ b/libnativeloader/include/nativeloader/dlext_namespaces.h
@@ -86,6 +86,19 @@ extern struct android_namespace_t* android_create_namespace(const char* name,
86 const char* permitted_when_isolated_path, 86 const char* permitted_when_isolated_path,
87 android_namespace_t* parent); 87 android_namespace_t* parent);
88 88
89/*
90 * Get the default library search path.
91 * The path will be copied into buffer, which must have space for at least
92 * buffer_size chars. Elements are separated with ':', and the path will always
93 * be null-terminated.
94 *
95 * If buffer_size is too small to hold the entire default search path and the
96 * null terminator, this function will abort. There is currently no way to find
97 * out what the required buffer size is. At the time of this writing, PATH_MAX
98 * is sufficient and used by all callers of this function.
99 */
100extern void android_get_LD_LIBRARY_PATH(char* buffer, size_t buffer_size);
101
89__END_DECLS 102__END_DECLS
90 103
91#endif /* __ANDROID_DLEXT_NAMESPACES_H__ */ 104#endif /* __ANDROID_DLEXT_NAMESPACES_H__ */
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index 94c46fc19..d7b5cb566 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -20,7 +20,7 @@
20#include <dlfcn.h> 20#include <dlfcn.h>
21#ifdef __ANDROID__ 21#ifdef __ANDROID__
22#define LOG_TAG "libnativeloader" 22#define LOG_TAG "libnativeloader"
23#include "dlext_namespaces.h" 23#include "nativeloader/dlext_namespaces.h"
24#include "cutils/properties.h" 24#include "cutils/properties.h"
25#include "log/log.h" 25#include "log/log.h"
26#endif 26#endif