android/Bootstrap/Makefile.shared | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
New commits:
commit a5730bde116ca6c96f3b2f4dbc16b1a385fbc416
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 30 14:24:23 2013 +0300
3rd party libs need to be listed more individually now, sigh
Change-Id: I604f681a43a209cb6951209e01be1bcc26cdc3c9
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index e7c7d1f..a78a663 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -73,9 +73,29 @@ clean: android_version_setup properties
#
# Build / link the single .so for this app
#
+
+# Sigh, it's sad that now with solver dying we have to list the
+# locations of each needed bundled 3rd-party lib like this. Maybe we
+# really should try to make these experimental Android apps (and the
+# iOS one) buildable with gbuild.
+
LIBS = \
-Wl,--start-group \
$(wildcard $(OUTDIR)/lib/lib*.a) \
+ $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
+ $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \
+ $(HARFBUZZ_LIBS) \
+ $(HUNSPELL_LIBS) \
+ $(HYPHEN_LIB) \
+ $(MYTHES_LIBS) \
+ $(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/openssl/*.a) \
-Wl,--end-group
WHOLELIBS = \
@@ -88,7 +108,7 @@ WHOLELIBS = \
$(OBJLOCAL)/liblo-native-code.so : $(wildcard $(OUTDIR)/lib/lib*.a)
native-code.cxx
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o
$(OBJLOCAL)/liblo-native-code.so -I$(SRCDIR)/include -I$(OUTDIR)/inc
native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid
-ljnigraphics -llog -lz
+ $(CXX) -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o
$(OBJLOCAL)/liblo-native-code.so -I$(SRCDIR)/include -I$(OUTDIR)/inc
native-code.cxx -L$(OUTDIR)/lib -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS)
$(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
