[Libreoffice-commits] .: Branch 'feature/android' - 2 commits - android/qa Library_merged.mk sc/CppunitTest_sc_filters_test.mk sc/qa solenv/gbuild

[Tor Lillqvist]

 Library_merged.mk                              |    5 +++--
 android/qa/desktop/Makefile                    |    2 --
 android/qa/sc/Makefile                         |    2 --
 sc/CppunitTest_sc_filters_test.mk              |    3 +++
 sc/qa/unit/helper/qahelper.hxx                 |   15 +++++++++++++++
 solenv/gbuild/extensions/pre_MergedLibsList.mk |    2 ++
 6 files changed, 23 insertions(+), 6 deletions(-)

New commits:
commit d6a8dc59fccd57a3f869791586e23008ac805428
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Feb 14 12:56:43 2012 +0200

    Special-case files in /assets on Android

diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 259d308..0ec2b93 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -63,6 +63,9 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test, \
     utl \
     vcl \
     xo \
+	$(if $(filter $(OS),ANDROID), \
+		lo-bootstrap \
+	) \
 	$(gb_STDLIBS) \
 ))
 
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 4c9ae91..c679c73 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -36,9 +36,24 @@
 #include <string>
 #include <sstream>
 
+#include <osl/detail/android-bootstrap.h>
+
 void loadFile(const rtl::OUString& aFileName, std::string& aContent)
 {
     rtl::OString aOFileName = rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8);
+
+#ifdef ANDROID
+    const char *contents;
+    size_t size;
+    if (strncmp(aOFileName.getStr(), "/assets/", sizeof("/assets/")-1) == 0) {
+        contents = (const char *) lo_apkentry(aOFileName.getStr(), &size);
+        if (contents != 0) {
+            aContent = std::string(contents, size);
+            return;
+        }
+    }
+#endif
+
     std::ifstream aFile(aOFileName.getStr());
 
     rtl::OStringBuffer aErrorMsg("Could not open csv file: ");
commit 35bc227b9eeef69a95b8b6996e3696e643f34b8c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Feb 14 12:39:43 2012 +0200

    Add svt and tk to libmerged

diff --git a/Library_merged.mk b/Library_merged.mk
index d1af075..a01cca8 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,13 +30,13 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 	cppuhelper \
 	i18nisolang1 \
 	i18npaper \
+    i18nutil \
+    jvmfwk \
 	sal \
 	salhelper \
 	sax \
 	sot \
 	svl \
-	svt \
-	tk \
 	tl \
 	ucbhelper \
 	utl \
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 
 $(eval $(call gb_Library_use_externals,merged,\
 	icuuc \
+	jpeg \
 	libxml2 \
 	zlib \
 ))
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index b02ebd0..67fdb7c 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -150,9 +150,7 @@ copy-stuff: buildrcs
 		  stocservices.uno \
 		  store \
 		  svllo \
-		  svtlo \
 		  test \
-		  tklo \
 		  tllo \
 		  ucb1 \
 		  ucbhelper4gcc3 \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 054ba79..71d145b 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -95,10 +95,8 @@ copy-stuff:
 		  stocservices.uno \
 		  store \
 		  svllo \
-		  svtlo \
 		  textinstream.uno \
 		  test \
-		  tklo \
 		  tllo \
 		  ucb1 \
 		  ucbhelper4gcc3 \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index cff4b19..a7dfc22 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -47,8 +47,10 @@ gb_MERGEDLIBS := \
 	sfx \
 	sofficeapp \
 	spl \
+	svt \
 	svx \
 	svxcore \
+	tk \
 	uui \
 	xo \