celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-354: Added ifdef for android's dlopen does not support RTLD_NODELETE
Date Wed, 20 Apr 2016 17:32:51 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 9653f0683 -> 9960f7990


CELIX-354: Added ifdef for android's dlopen does not support RTLD_NODELETE


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/9960f799
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/9960f799
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/9960f799

Branch: refs/heads/develop
Commit: 9960f7990318465d8d6883cdb18f970b2e402794
Parents: 9653f06
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Apr 20 19:34:21 2016 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Apr 20 19:34:21 2016 +0200

----------------------------------------------------------------------
 framework/private/src/framework.c | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/9960f799/framework/private/src/framework.c
----------------------------------------------------------------------
diff --git a/framework/private/src/framework.c b/framework/private/src/framework.c
index 11e4d9a..297cbf9 100644
--- a/framework/private/src/framework.c
+++ b/framework/private/src/framework.c
@@ -176,7 +176,12 @@ static void framework_loggerInit(void) {
     }
 #else
     #define handle_t void *
+    #ifdef ANDROID
+    #define 
+    #define fw_openLibrary(path) dlopen(path, RTLD_LAZY|RTLD_LOCAL)
+    #else
     #define fw_openLibrary(path) dlopen(path, RTLD_LAZY|RTLD_LOCAL|RTLD_NODELETE)
+    #endif
     #define fw_closeLibrary(handle) dlclose(handle)
     #define fw_getSymbol(handle, name) dlsym(handle, name)
     #define fw_getLastError() dlerror()


Mime
View raw message