summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-06-30 23:34:15 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-07-01 09:12:21 +0200
commitb046b687f9caa71db29ce16e0d211d530648d141 (patch)
treef81fe55cc2c2f5380023e8a5f85dd78ace858c85 /solenv
parentca61fdcac919f799b5273c24932adc0cbd8300e2 (diff)
lok bootstrap: nicer function names, clean-up
+ prevent lokandroid JNI functions to be removed from the library + basic use of lok Office / Document in LibreOfficeMainActivity Change-Id: I7bfe53738cf821b2270ab3e024cc506a7cff42f0
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/bin/native-code.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 0de8ed3ce62d..4b3b87b843f7 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -230,8 +230,13 @@ if options.java:
extern void Java_org_libreoffice_android_AppSupport_renderVCL();
p = (void *) Java_org_libreoffice_android_AppSupport_renderVCL;
- extern void Java_org_libreoffice_android_LibreOfficeKit_init__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2();
- p = (void *) Java_org_libreoffice_android_LibreOfficeKit_init__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2;""")
+ extern void Java_org_libreoffice_kit_LibreOfficeKit_initializeNative();
+ p = (void *) Java_org_libreoffice_kit_LibreOfficeKit_initializeNative;
+
+ extern void Java_org_libreoffice_kit_Office_initialize();
+ p = (void *) Java_org_libreoffice_kit_Office_initialize;
+
+ """)
print ("""
return map;