From 855be6e23f7ec878a159dd1eb8594fc9723ddcef Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Wed, 1 Jul 2026 16:51:13 +0200 Subject: [PATCH] sal, android: Drop unused libreofficekit_set_javavm This was introduced in commit f43483ce36b8a50ecc9266f26bc7b4ac302c6661 Date: Mon Feb 18 13:25:40 2019 +0100 android: Expose setting of the JavaVM. Needed when we use the liblo-native-code as a library. , but is unused. Apparently, it was needed for the Collabora Online Android app in the past (see corresponding commit [1]), but that one no longer uses this repo. [1] https://github.com/CollaboraOnline/online/commit/91280ea90565dcbd81e77f3ed74e2ac2039a91f4 Change-Id: I9a6ebe275d894ca3d2bdbd7dcdf53751c6d15940 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207538 Reviewed-by: Michael Weghorn Tested-by: Jenkins --- include/osl/detail/android-bootstrap.h | 4 ---- sal/android/lo-bootstrap.c | 7 ------- 2 files changed, 11 deletions(-) diff --git a/include/osl/detail/android-bootstrap.h b/include/osl/detail/android-bootstrap.h index 169f3efaf282..5a5c7fcbd82d 100644 --- a/include/osl/detail/android-bootstrap.h +++ b/include/osl/detail/android-bootstrap.h @@ -35,10 +35,6 @@ 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 0af8cfbb4cd3..d1ecd810ab19 100644 --- a/sal/android/lo-bootstrap.c +++ b/sal/android/lo-bootstrap.c @@ -897,13 +897,6 @@ Java_org_libreoffice_android_Bootstrap_address_1of_1direct_1byte_1buffer(JNIEnv return (jlong) (intptr_t) (*env)->GetDirectBufferAddress(env, bbuffer); } -__attribute__ ((visibility("default"))) -void -libreofficekit_set_javavm(JavaVM *vm) -{ - the_java_vm = vm; -} - __attribute__ ((visibility("default"))) JavaVM * lo_get_javavm(void)