[Libreoffice-commits] core.git: 2 commits - android/Bootstrap bin/lo-all-static-libs

[Tor Lillqvist]

 android/Bootstrap/Makefile.shared |   28 +---------------------------
 bin/lo-all-static-libs            |   10 +++++++++-
 2 files changed, 10 insertions(+), 28 deletions(-)

New commits:
commit e6a8768233fc15be51226780f4003da20cca575f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 22 23:27:48 2013 +0200

    Use lo-all-static-libs
    
    Change-Id: Ifaf7a6f6dd61d27a89feed2f718f7a91e9da7262

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 9da0414..74bec2d 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -81,33 +81,7 @@ clean: android_version_setup properties
 
 LIBS = \
   -Wl,--start-group \
-  $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
-  $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \
-  $(FREEHAND_LIBS) \
-  $(HARFBUZZ_LIBS) \
-  $(HUNSPELL_LIBS) \
-  $(HYPHEN_LIB) \
-  $(MYTHES_LIBS) \
-  $(EBOOK_LIBS) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/curl/lib/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/freetype/objs/.libs/libfreetype.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/libodfgen/src/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/liborcus/src/*/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/lpsolve/lpsolve55/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/redland/src/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/xml2/.libs/*.a) \
-  $(wildcard $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs/*.a) \
+  $(shell $(SRCDIR)/lo-all-static-libs) \
   -Wl,--end-group
 
 WHOLELIBS = \
commit afd16e30f679e8e1e86edf1ee4185cf5b9cf4186
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Nov 22 18:18:48 2013 +0200

    Add libs built only for Android
    
    Change-Id: Ib7087701fc918f5f871491ce78e4afad004db9dc

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index b363e67..f6b726b 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -18,7 +18,7 @@ if test "$OS" != ANDROID -a "$OS" != IOS; then
 fi
 
 foolibs=
-for var in EBOOK_LIBS FREEHAND_LIBS HUNSPELL_LIBS HYPHEN_LIB MYTHES_LIBS; do
+for var in EBOOK_LIBS FREEHAND_LIBS HARFBUZZ_LIBS HUNSPELL_LIBS HYPHEN_LIB MYTHES_LIBS; do
     dirs=
     libs=
     for i in `eval echo '$'$var`; do
@@ -34,9 +34,17 @@ for var in EBOOK_LIBS FREEHAND_LIBS HUNSPELL_LIBS HYPHEN_LIB MYTHES_LIBS; do
     done
 done
 
+androidlibs=
+if test "$OS" = ANDROID; then
+    androidlibs="$WORKDIR/UnpackedTarball/curl/lib/.libs/*.a"
+    androidlibs="$androidlibs $WORKDIR/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a"
+    androidlibs="$androidlibs $WORKDIR/UnpackedTarball/freetype/src/.libs/libfreetype.a"
+fi
+
 echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
      $foolibs \
      $WORKDIR/LinkTarget/StaticLibrary/lib*.a \
+     $androidlibs \
      $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
      $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
      $WORKDIR/UnpackedTarball/libcdr/src/lib/.libs/*.a \