[Libreoffice-commits] .: Branch 'feature/android-single-dso' - android/experimental

[Libreoffice Gerrit user]

 android/experimental/DocumentLoader/Makefile |  188 ---------------------------
 1 file changed, 1 insertion(+), 187 deletions(-)

New commits:
commit 84e01cf1c2584dc399d635eeda06003d7d520545
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Oct 9 14:42:06 2012 +0300

    Just use the wildcard function to list all the libs
    
    It doesn't seem to be any slower. (Note that we are *not* using
    -Wl,--whole-archive around these libs so it won't link in them in
    total, but only what's needed.)
    
    Change-Id: I2cc090562fc910d3375c6293f1f4358c68a6f9f3

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 42a1c1e..28ecce6 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -25,193 +25,7 @@ endef
 
 LIBS = \
   -Wl,--start-group \
-  $(addprefix -l,$(strip \
-	acclo \
-	ascii_expat_xmlparse \
-	avmedialo \
-	basctllo \
-	basebmp \
-	basegfxlo \
-	bootstrap.uno \
-	canvastoolslo \
-	cdrlib \
-	collator_data \
-	comphelpgcc3 \
-	configmgr.uno \
-	cppcanvaslo \
-	crypto \
-	cuilo \
-	dbalo \
-	dbaxmllo \
-	dbtoolslo \
-	dbulo \
-	deploymentmisclo \
-	dict_ja \
-	dict_zh \
-	drawinglayerlo \
-	editenglo \
-	egilo \
-	emelo \
-	epblo \
-	epglo \
-	epplo \
-	epslo \
-	eptlo \
-	eralo \
-	etilo \
-	evtattlo \
-	expat_xmlparse \
-	expat_xmltok \
-	explo \
-	expwrap.uno \
-	fastsax.uno \
-	fileacc \
-	filterconfiglo \
-	fontconfig \
-	forlo \
-	foruilo \
-	freetype \
-	frmlo \
-	fsstorage.uno \
-	fwelo \
-	fwilo \
-	fwklo \
-	fwllo \
-	fwmlo \
-	gcc3_uno \
-	hunspell-1.3 \
-	hwplo \
-	hyphen \
-	hyphenlo \
-	i18nisolang1gcc3 \
-	i18npool.uno \
-	i18nregexplo \
-	i18nsearch.uno \
-	i18nutilgcc3 \
-	icdlo \
-	icglo \
-	icudata \
-	icui18n \
-	icule \
-	icutu \
-	icuuc \
-	idxlo \
-	imelo \
-	index_data \
-	introspection.uno \
-	ipblo \
-	ipdlo \
-	ipslo \
-	iptlo \
-	ipxlo \
-	iralo \
-	itglo \
-	itilo \
-	java_uno \
-	jpeg \
-	jvmaccessgcc3 \
-	jvmfwk \
-	lcms2 \
-	libotouchlo \
-	lnglo \
-	lnthlo \
-	lo-bootstrap \
-	localebe1.uno \
-	localedata_en \
-	localedata_es \
-	localedata_euro \
-	localedata_others \
-	loglo \
-	log_uno_uno \
-	lpsolve55 \
-	lwpftlo \
-	msfilterlo \
-	mspublib \
-	mswordlo \
-	mythes-1.2 \
-	ooxlo \
-	orcus \
-	package2 \
-	raptor \
-	rasqal \
-	rdf \
-	reflection.uno \
-	reg \
-	saxlo \
-	sax_shared \
-	sblo \
-	sclo \
-	scdlo \
-	scfiltlo \
-	scuilo \
-	sddlo \
-	sdfiltlo \
-	sdlo \
-	sduilo \
-	sfxlo \
-	smdlo \
-	smlo \
-	sotlo \
-	spelllo \
-	spllo \
-	stocservices.uno \
-	store \
-	sunjavaplugin \
-	svgfilterlo \
-	svllo \
-	svtlo \
-	svxcorelo \
-	svxlo \
-	swdlo \
-	swlo \
-	swuilo \
-	t602filterlo \
-	textconv_dict \
-	textconversiondlgslo \
-	textfdlo \
-	textinstream.uno \
-	textoutstream.uno \
-	tklo \
-	tllo \
-	ucb1 \
-	ucbhelper4gcc3 \
-	ucpfile1 \
-	ucppkg1 \
-	ulingu \
-	uno_cppu \
-	uno_cppuhelpergcc3 \
-	uno_sal \
-	uno_salhelpergcc3 \
-	uno_cppuhelpergcc3 \
-	unordflo \
-	unoxmllo \
-	utllo \
-	uuilo \
-	vbahelperlo \
-	vbaswobj.uno \
-	vcllo \
-	visiolib \
-	wpdlib \
-	wpftdrawlo \
-	wpftwriterlo \
-	wpglib \
-	wpslib \
-	writerfilterlo \
-	writerperfect \
-	xml2 \
-	xmlfalo \
-	xmlfdlo \
-	xmlreader \
-	xmlscriptlo \
-	xmlsecurity \
-	xoflo \
-	xolo \
-	xsec_fw \
-	xslt \
-	xsltdlglo \
-	xsltfilterlo \
-	xstor \
-  )) \
+  $(wildcard $(OUTDIR)/lib/lib*.a) \
   -Wl,--end-group
 
 WHOLELIBS = \