solenv/gbuild/platform/ANDROID_ARM_GCC.mk | 26 ++++++++++++++++++++++++++
tail_build/prj/build.lst | 2 +-
2 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 25a09766198e82bb4e0b638c4af038fbb76b05fb
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Sat Nov 12 01:00:31 2011 +0200
Mark l10ntools as DESKTOP only here, too
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 01e2633..2235197 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx
basic bridges canvas comphelper configmgr connectivity cppcanvas cppu
cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi
qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv
soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil
unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2
LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd
LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl
PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf
avmedia basegfx basic bridges canvas comphelper configmgr connectivity
cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg
oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2
solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi
unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit e733650ab7fd6e9c0ece21cdd8cf2defae0746ee
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Sat Nov 12 00:54:11 2011 +0200
Always use -shared and -llog -landroid for Android also in gbuild
diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index 92ad366..695f68d 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -39,4 +39,30 @@ include $(GBUILDDIR)/platform/unxgcc.mk
# No unit testing can be run
gb_CppunitTest_CPPTESTPRECOMMAND := :
+# Re-define this shebang from unxgcc.mk, adding -shared and -llog
+# -landroid Just temporarily done this way, shm_get promised to do
+# this in some more elegant fashion.
+
+define gb_LinkTarget__command_dynamiclink
+$(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_CXX) \
+ -shared \
+ $(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
+ $(subst \d,$$,$(RPATH)) \
+ $(T_LDFLAGS) \
+ $(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
+ $(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
+ $(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
+ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat
$(extraobjectlist)`) \
+ -Wl$(COMMA)--start-group $(foreach
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib)))
-Wl$(COMMA)--end-group \
+ $(LIBS) \
+ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach
lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
+ -llog -landroid \
+ -o $(1))
+endef
+
# vim: set noet sw=4:
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
