summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-02-14 14:54:02 +0100
committerJan Holesovsky <kendy@collabora.com>2019-03-11 17:42:48 +0100
commit35cae83fd9ff174327092cc7fd9cc769ace71f4d (patch)
tree4191fa2ac912f8e5c05c7a923eccae578f7781fa /desktop
parentdba1f992d0757b9c353dd41d55dd89ecafd70603 (diff)
android: Generate liblo-native-code.so so that it can be linked against.
And used for LibreOfficeKit directly, without a JNI wrapper. Change-Id: If4231f53b579417b6c9c90b39541193bf2e8f27c Reviewed-on: https://gerrit.libreoffice.org/67874 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6e254d961331..65da82f294ad 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4629,7 +4629,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
return bInitialized;
}
-SAL_DLLPUBLIC_EXPORT
+SAL_JNI_EXPORT
LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user_profile_url)
{
if (!gImpl)
@@ -4645,7 +4645,7 @@ LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user
return static_cast<LibreOfficeKit*>(gImpl);
}
-SAL_DLLPUBLIC_EXPORT
+SAL_JNI_EXPORT
LibreOfficeKit *libreofficekit_hook(const char* install_path)
{
return libreofficekit_hook_2(install_path, nullptr);