diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-06-12 07:47:25 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-06-12 07:47:25 +0200 |
| commit | 089ff7a374df9870c506c36720a1b9cab3a252f6 (patch) | |
| tree | fd95e6865ab66e1444a7185fdf6b26ae88591e06 /bin | |
| parent | b3559e5c6ce036b1a4fe96c0ffc935e0c94a7b10 (diff) | |
Android tinderbox build breaker
add openssl library back for Android static link
Change-Id: I7ac5c3f9c00060f926f03fb21d8fa5e87b928c71
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lo-all-static-libs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs index 381090a036ec..555ad67674a7 100755 --- a/bin/lo-all-static-libs +++ b/bin/lo-all-static-libs @@ -43,10 +43,10 @@ ANDROID) oslibs="$oslibs $WORKDIR/UnpackedTarball/cairo/src/.libs/libcairo.a" # Only liblo-bootstrap.a ends up here: oslibs="$oslibs $WORKDIR/LinkTarget/Library/lib*.a" + oslibs="$oslibs $WORKDIR/UnpackedTarball/openssl/*.a" ;; IOS) oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a" - osssl="" ;; *) oslibs= @@ -76,7 +76,6 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \ $WORKDIR/UnpackedTarball/liborcus/src/*/.libs/*.a \ $WORKDIR/UnpackedTarball/libvisio/src/lib/.libs/*.a \ $WORKDIR/UnpackedTarball/libwp?/src/lib/.libs/*.a \ - $osssl \ $WORKDIR/UnpackedTarball/raptor/src/.libs/*.a \ $WORKDIR/UnpackedTarball/rasqal/src/.libs/*.a \ $WORKDIR/UnpackedTarball/redland/src/.libs/*.a \ |