diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-25 16:41:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-25 19:05:31 +0200 |
| commit | f9c0e552355a0ae30ba75b427a3d8749ca8ebe9b (patch) | |
| tree | 0b475f8d9286fe2a398014b6358863b459c7b29e /sal/inc | |
| parent | 113dca13b1d0f957d69c25d6d9e84e821bd710aa (diff) | |
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 'sal/inc')
| -rw-r--r-- | sal/inc/osl/detail/android_native_app_glue.h (renamed from sal/inc/osl/detail/android.h) | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sal/inc/osl/detail/android.h b/sal/inc/osl/detail/android_native_app_glue.h index beb5b1d348a3..1b8c1f10725d 100644 --- a/sal/inc/osl/detail/android.h +++ b/sal/inc/osl/detail/android_native_app_glue.h @@ -30,11 +30,6 @@ extern "C" { #endif -/* - * Global activity to be hooked by upper layers. - */ -extern struct android_app *global_android_app; - /** * The native activity interface provided by <android/native_activity.h> * is based on a set of application-provided callbacks that will be called @@ -86,6 +81,8 @@ extern struct android_app *global_android_app; * full usage example. Also look at the JavaDoc of NativeActivity. */ +struct android_app; + /** * Data associated with an ALooper fd that will be returned as the "outData" * when that source has data ready. |