summaryrefslogtreecommitdiffstats
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-01-25 16:41:45 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-01-25 19:05:31 +0200
commitf9c0e552355a0ae30ba75b427a3d8749ca8ebe9b (patch)
tree0b475f8d9286fe2a398014b6358863b459c7b29e /solenv
parentWaE: int and long confusion (diff)
downloadcore-f9c0e552355a0ae30ba75b427a3d8749ca8ebe9b.tar.gz
core-f9c0e552355a0ae30ba75b427a3d8749ca8ebe9b.zip
Bin global_android_app and instead use lo-bootstrap API
Instead of introducing a global variable, use the already existing saved android_app pointer in lo-bootstrap.c, and just add a function to rettrieve that. Reanme osl/detail/android.h back to android_native_app_glue.h, which is the file from NDK/sources that it is. "android.h" sounded to me too grand, as if it was some universal Android header. But if we do start to modify the android_native_app_glue stuff heavily, then it indeed makes sense to call it something else. Until then, revert also some whitespace changes to android_native_app_glue.c for it to be as close as possible to the "upstream" one in the NDK, for clarity.
Diffstat (limited to 'solenv')
-rw-r--r--solenv/inc/unxandr/lo-bootstrap.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/solenv/inc/unxandr/lo-bootstrap.h b/solenv/inc/unxandr/lo-bootstrap.h
index 48b1a5c57e72..d78d88beaaab 100644
--- a/solenv/inc/unxandr/lo-bootstrap.h
+++ b/solenv/inc/unxandr/lo-bootstrap.h
@@ -66,6 +66,8 @@ int lo_dlcall_argc_argv(void *function,
JavaVM *lo_get_javavm(void);
+struct android_app *lo_get_app(void);
+
#ifdef __cplusplus
}
#endif