summaryrefslogtreecommitdiff
path: root/vcl/inc/android
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:39:06 +0200
commit25f78344e8dea95cedb0b981f08865d676154e5b (patch)
treec47a47c65587669ee0cfa5c4efbe0c79cb94e762 /vcl/inc/android
parentc4e35496393c73e73a297e8c5398cb6f96a35e46 (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 retrieve it from there. Store it in the AndroidSalInstance. Reanme osl/detail/android.h back to android_native_app_glue.h, which is the name of that file in NDK/sources. "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 'vcl/inc/android')
-rw-r--r--vcl/inc/android/androidinst.hxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx
index a5c69b0f419a..3b026b0d9357 100644
--- a/vcl/inc/android/androidinst.hxx
+++ b/vcl/inc/android/androidinst.hxx
@@ -45,6 +45,7 @@ public:
virtual bool AnyInput( sal_uInt16 nType );
protected:
virtual void DoReleaseYield( int nTimeoutMS );
+ struct android_app *app;
};
#endif // ANDROID_SALINST_H