summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-10-23 13:28:53 +0300
committerTor Lillqvist <tml@collabora.com>2013-10-23 13:31:58 +0300
commit763114f8b7a7705e1b28226da33bf00016ad7982 (patch)
tree05b9b1c9bf9bc06674ea5b07beaa34937804bdc4 /android
parentf852bda5ecf68c9450925bc95138509ffadb4a43 (diff)
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
Diffstat (limited to 'android')
-rw-r--r--android/Bootstrap/Makefile.shared2
1 files changed, 2 insertions, 0 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 27b2c139393f..912f09bd86c2 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 = \