[Libreoffice-commits] .: 3 commits - android/qa bridges/source distro-configs/LibreOfficeAndroid.conf

[Tor Lillqvist]

 android/qa/sc/Makefile                            |   11 ++---------
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx |    7 +++++++
 distro-configs/LibreOfficeAndroid.conf            |    1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 617c8075aca140a09a57a3d9da4fdc80a64998c5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jan 13 12:30:46 2012 +0200

    Use cacheflush() on Android

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 9869bb5..91b96cd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -46,6 +46,9 @@
 
 #include <dlfcn.h>
 
+#ifdef ANDROID
+#include <unistd.h>
+#endif
 
 using namespace ::osl;
 using namespace ::rtl;
@@ -551,10 +554,14 @@ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
 void bridges::cpp_uno::shared::VtableFactory::flushCode(
     unsigned char const *beg, unsigned char const *end)
 {
+#ifndef ANDROID
    static void (*clear_cache)(unsigned char const*, unsigned char const*)
        = (void (*)(unsigned char const*, unsigned char const*))
            dlsym(RTLD_DEFAULT, "__clear_cache");
    (*clear_cache)(beg, end);
+#else
+   cacheflush((long) beg, (long) end, 0);
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6022e3caa12ba762bda7d50dcc540660712a1880
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jan 13 11:02:29 2012 +0200

    Now we need libdb, too

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 04cd88f..3499906 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -60,6 +60,7 @@ copy-stuff:
 		  bootstrap.uno \
 		  comphelpgcc3 \
 		  configmgr.uno \
+		  db-4.7 \
 		  fontconfig \
 		  forlo \
 		  foruilo \
commit 65e9ac63b8b0327c1a39220fa6326bc88f06c62d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jan 13 10:58:19 2012 +0200

    Use merged libs on Android

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 1b9ac87..04cd88f 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -55,16 +55,11 @@ copy-stuff:
 # Libs and UNO components that the tests need.
 #
 	for F in $(strip \
-		  avmedialo \
 		  basebmplo \
 		  basegfxlo \
 		  bootstrap.uno \
-		  canvastoolslo \
 		  comphelpgcc3 \
 		  configmgr.uno \
-		  cppcanvaslo \
-		  drawinglayerlo \
-		  editenglo \
 		  fontconfig \
 		  forlo \
 		  foruilo \
@@ -83,11 +78,11 @@ copy-stuff:
 		  icuuclo \
 		  jvmaccessgcc3 \
 		  jvmfwk \
-		  lnglo \
 		  localedata_en \
 		  localedata_es \
 		  localedata_euro \
 		  localedata_others \
+		  mergedlo \
 		  msfilterlo \
 		  reg \
 		  saxlo \
@@ -98,8 +93,6 @@ copy-stuff:
 		  store \
 		  svllo \
 		  svtlo \
-		  svxcorelo \
-		  svxlo \
 		  test \
 		  tklo \
 		  tllo \
@@ -120,7 +113,6 @@ copy-stuff:
 		  xcrlo \
 		  xml2 \
 		  xmlreader \
-		  xolo \
 		  ); do \
 	    $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
 	done
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index c9bc5ab..fa54534 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -16,6 +16,7 @@
 --disable-randr-link
 --disable-systray
 --disable-xmlsec
+--enable-mergelibs
 --enable-python=internal
 --without-fonts
 --without-junit