jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit 759f55c01059b599f4294ea2e37d3dc3748a54be Author: Thorsten Behrens <[email protected]> AuthorDate: Sun May 17 01:47:20 2020 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Sun May 17 03:07:25 2020 +0200 jvmfwk: fix [-Werror,-Wunused-function] After recent cleanups, android build fails with sunjavaplugin.cxx:204:5: error: unused function 'createJvm' [-Werror,-Wunused-function] Change-Id: Idc9a97673debdd5da798fbdc729b8d90b6b7af9c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94371 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 1d3667988cf9..7fcd60891263 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -201,6 +201,7 @@ extern "C" void JNICALL abort_handler() typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *); +#ifndef ANDROID int createJvm( JNI_CreateVM_Type * pCreateJavaVM, JavaVM ** pJavaVM, JNIEnv ** ppEnv, JavaVMInitArgs * vm_args) { @@ -228,6 +229,7 @@ int createJvm( err= 1; return err; } +#endif /** helper function to check Java version requirements _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
