summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-11-22 18:18:48 +0200
committerTor Lillqvist <tml@collabora.com>2013-11-22 23:28:09 +0200
commitafd16e30f679e8e1e86edf1ee4185cf5b9cf4186 (patch)
tree0c478e8614348363357d65e12ae3ebee3ff0b1d2 /bin
parent7d19b744a6a6247cdade95996571f7963f410dc2 (diff)
Add libs built only for Android
Change-Id: Ib7087701fc918f5f871491ce78e4afad004db9dc
Diffstat (limited to 'bin')
-rwxr-xr-xbin/lo-all-static-libs10
1 files changed, 9 insertions, 1 deletions
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index b363e67e4c9e..f6b726b85d51 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 \