android/Bootstrap/Makefile.shared | 2 +- android/Bootstrap/project.properties | 2 +- android/abs-lib/project.properties | 2 +- android/experimental/LibreOffice4Android/project.properties | 2 +- solenv/bin/native-code.py | 9 +++++++++ 5 files changed, 13 insertions(+), 4 deletions(-)
New commits: commit 804e3bfc56ad6d42a6b76d9e227dde759befd5d2 Author: Tor Lillqvist <[email protected]> Date: Fri Mar 28 12:43:57 2014 +0200 Maybe we need libsblo.a for Android Saw messages about that in logcat. Didn't help making the 'desktop' app work again, though. I wonder when it last worked. Change-Id: I32f7f32a30f3d00aa0754c00469ecddf2831aad5 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index a6a21ce..88dbf74 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -143,6 +143,7 @@ draw_constructor_list = [ ] writer_factory_list = [ + ("libsblo.a", "sb_component_getFactory"), ("libswdlo.a", "swd_component_getFactory"), ("libswlo.a", "sw_component_getFactory"), ("libwriterfilterlo.a", "writerfilter_component_getFactory"), @@ -186,7 +187,11 @@ extern "C" { if options.groups: for factory_group in options.groups: for (factory_name,factory_function) in factory_map[factory_group]: + if factory_function == 'sb_component_getFactory': + print ('#ifdef ANDROID') print ('void * '+factory_function+'( const char* , void* , void* );') + if factory_function == 'sb_component_getFactory': + print ('#endif') print ('') if options.groups: @@ -203,7 +208,11 @@ lo_get_factory_map(void) if options.groups: for factory_group in options.groups: for (factory_name,factory_function) in factory_map[factory_group]: + if factory_function == 'sb_component_getFactory': + print ('#ifdef ANDROID') print (' { "'+factory_name+'", '+factory_function+' },') + if factory_function == 'sb_component_getFactory': + print ('#endif') print (""" { 0, 0 } commit c927ceb96c17783b2a18401307f51b91d7841f33 Author: Tor Lillqvist <[email protected]> Date: Fri Mar 28 12:12:44 2014 +0200 Switch to android-15 here, too Change-Id: If7b66e60fcf8af97a69e20af9c77793a163c4c17 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 7c8dea9..fd86421 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -55,7 +55,7 @@ properties: echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties echo "# File needed by ndk-gdb" >jni/Application.mk echo "APP_ABI := $(ANDROID_APP_ABI)" > jni/Application.mk - echo "APP_PLATFORM := android-14" >> jni/Application.mk + echo "APP_PLATFORM := android-15" >> jni/Application.mk install: build-ant unset JAVA_HOME && $(ANT) -quiet debug install diff --git a/android/Bootstrap/project.properties b/android/Bootstrap/project.properties index 5ca7d62..f28bc83 100644 --- a/android/Bootstrap/project.properties +++ b/android/Bootstrap/project.properties @@ -9,4 +9,4 @@ android.library=true # Project target. -target=android-14 +target=android-15 diff --git a/android/abs-lib/project.properties b/android/abs-lib/project.properties index 5ca7d62..f28bc83 100755 --- a/android/abs-lib/project.properties +++ b/android/abs-lib/project.properties @@ -9,4 +9,4 @@ android.library=true # Project target. -target=android-14 +target=android-15 diff --git a/android/experimental/LibreOffice4Android/project.properties b/android/experimental/LibreOffice4Android/project.properties index fc22b7f..501a51d 100644 --- a/android/experimental/LibreOffice4Android/project.properties +++ b/android/experimental/LibreOffice4Android/project.properties @@ -8,7 +8,7 @@ # project structure. # Project target. -target=android-14 +target=android-15 # Use the Bootstrap class android.library.reference.1=../../Bootstrap _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
