[Libreoffice-commits] core.git: android/Bootstrap

Tor Lillqvist tml at collabora.com
Wed Oct 23 03:32:46 PDT 2013


 android/Bootstrap/Makefile.shared |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 763114f8b7a7705e1b28226da33bf00016ad7982
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Oct 23 13:28:53 2013 +0300

    libxml2 and libxslt libs are only in workdir now
    
    We really should set up this list of all the libraries (even one including
    wildcards) in a single place in configury. Now this information is duplicated
    in several places. (Such a list is used when linking a single (app-specific)
    DSO for an Android app or a single executable for an iOS app.)
    
    Change-Id: Ic77bdd5a4e58686693f4ac3987ba73bca011db3b

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 27b2c13..912f09b 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -96,6 +96,8 @@ LIBS = \
   $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/xml2/.libs/*.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs/*.a) \
   -Wl,--end-group
 
 WHOLELIBS = \


More information about the Libreoffice-commits mailing list