diff options
| -rw-r--r-- | include/osl/detail/android-bootstrap.h | 4 | ||||
| -rw-r--r-- | sal/android/lo-bootstrap.c | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/osl/detail/android-bootstrap.h b/include/osl/detail/android-bootstrap.h index 5a5c7fcbd82d..169f3efaf282 100644 --- a/include/osl/detail/android-bootstrap.h +++ b/include/osl/detail/android-bootstrap.h @@ -35,6 +35,10 @@ int lo_apk_closedir(lo_apk_dir *dirp); int lo_apk_lstat(const char *path, struct stat *statp); +/// "libreofficekit_" prefix, because it is exported from the .so, when we are +/// initializing the JNI externally. +void libreofficekit_set_javavm(JavaVM *vm); + JavaVM *lo_get_javavm(void); const char *lo_get_app_data_dir(void); diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c index d1ecd810ab19..0af8cfbb4cd3 100644 --- a/sal/android/lo-bootstrap.c +++ b/sal/android/lo-bootstrap.c @@ -898,6 +898,13 @@ Java_org_libreoffice_android_Bootstrap_address_1of_1direct_1byte_1buffer(JNIEnv } __attribute__ ((visibility("default"))) +void +libreofficekit_set_javavm(JavaVM *vm) +{ + the_java_vm = vm; +} + +__attribute__ ((visibility("default"))) JavaVM * lo_get_javavm(void) { |