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:39:06 +0200 |
| commit | 25f78344e8dea95cedb0b981f08865d676154e5b (patch) | |
| tree | c47a47c65587669ee0cfa5c4efbe0c79cb94e762 /sal/Package_inc.mk | |
| parent | c4e35496393c73e73a297e8c5398cb6f96a35e46 (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 'sal/Package_inc.mk')
| -rw-r--r-- | sal/Package_inc.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk index d0520efcd757..e43de3e46388 100644 --- a/sal/Package_inc.mk +++ b/sal/Package_inc.mk @@ -64,7 +64,7 @@ $(eval $(call gb_Package_add_file,sal_inc,inc/osl/thread.hxx,osl/thread.hxx)) $(eval $(call gb_Package_add_file,sal_inc,inc/osl/time.h,osl/time.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/osl/util.h,osl/util.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/file.h,osl/detail/file.h)) -$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/android.h,osl/detail/android.h)) +$(eval $(call gb_Package_add_file,sal_inc,inc/osl/detail/android_native_app_glue.h,osl/detail/android_native_app_glue.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/allocator.hxx,rtl/allocator.hxx)) $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/alloc.h,rtl/alloc.h)) $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/bootstrap.h,rtl/bootstrap.h)) |