strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

android: attach as daemon with given JNI version, and don't exit.

Browse source
This commit is contained in:
Michael Meeks 2012-01-27 14:50:21 +00:00
parent 76bdcb53a5
commit 5174166859
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sal/android/lo-bootstrap.c
View file

@ -47,7 +47,7 @@
#include <android/log.h>
#include "uthash.h"
#include <osl/thread.h>
#include "osl/detail/android-bootstrap.h"
#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
@ -1482,16 +1482,25 @@ __attribute__ ((visibility("default")))
void
android_main(struct android_app* state)
{
JNIEnv *env;
jint nRet;
JNIEnv *pEnv = NULL;
struct engine engine;
Dl_info lo_main_info;
JavaVMAttachArgs aArgs = {
JNI_VERSION_1_2,
"LibreOfficeThread",
NULL
};
fprintf (stderr, "android_main in thread: %d\n", (int)pthread_self());
if (sleep_time != 0) {
LOGI("android_main: Sleeping for %d seconds, start ndk-gdb NOW if that is your intention", sleep_time);
sleep(sleep_time);
}
(*(*state->activity->vm)->AttachCurrentThread)(state->activity->vm, &env, 0);
nRet = (*(*state->activity->vm)->AttachCurrentThreadAsDaemon)(state->activity->vm, &pEnv, &aArgs);
fprintf (stderr, "attach thread returned %d %p\n", nRet, pEnv);
app = state;
@ -1508,8 +1517,7 @@ android_main(struct android_app* state)
extract_files(UNPACK_TREE);
lo_main(lo_main_argc, lo_main_argv);
exit(0);
fprintf (stderr, "exit android_main\n");
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */