[Libreoffice-commits] .: Branch 'feature/androidapp' - 2 commits - android/qa

[Libreoffice Gerrit user]

 android/qa/desktop/jni/Application.mk |    2 --
 android/qa/desktop/native-code.cxx    |    5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 0cf6686549c61e3066876ab974f6b96bbde261db
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Dec 17 10:28:17 2012 +0200

    This file gets constructed at build-time so no point having it in git
    
    See the properties target in android/Bootstrap/Makefile.shared.

diff --git a/android/qa/desktop/jni/Application.mk b/android/qa/desktop/jni/Application.mk
deleted file mode 100644
index 9b408d0..0000000
--- a/android/qa/desktop/jni/Application.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-APP_ABI := x86
-APP_PLATFORM := android-14
commit d7a9a596d960271ab6cb413694b01600a27e0087
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Dec 17 10:25:02 2012 +0200

    Pull in Java_org_libreoffice_android_examples_LODesktop_spawnMain

diff --git a/android/qa/desktop/native-code.cxx b/android/qa/desktop/native-code.cxx
index 22c9a7e..06caf06 100644
--- a/android/qa/desktop/native-code.cxx
+++ b/android/qa/desktop/native-code.cxx
@@ -99,6 +99,11 @@ lo_get_libmap(void)
         { NULL, NULL }
     };
 
+    // We need to pull this in, too, as it isn't in any of the libs we
+    // link with -Wl,--whole-archive.
+    extern void Java_org_libreoffice_android_examples_LODesktop_spawnMain();
+    volatile void *p = (void *) Java_org_libreoffice_android_examples_LODesktop_spawnMain;
+
     return map;
 }