add lingucomponent libs to Library_merged

Change-Id: Ib34f589b377991b9e2d043d43ecf0360031ddae3

2 files changed, 26 insertions, 45 deletions

diff --git a/Library_merged.mk b/Library_merged.mk
index db8991dbf75e..651f608e7426 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -49,10 +49,13 @@ $(eval $(call gb_Library_use_static_libraries,merged,\
 endif
 
 $(eval $(call gb_Library_use_externals,merged,\
+	$(if $(filter-out IOS,$(OS)),cdr) \
 	$(call gb_Helper_optional,DESKTOP,clucene) \
 	cppunit \
 	cups \
-	$(call gb_Helper_optional,DESKTOP,expat_utf8) \
+	expat_utf8 \
+	hunspell \
+	hyphen \
 	icui18n \
 	icule \
 	icuuc \
@@ -60,33 +63,23 @@ $(eval $(call gb_Library_use_externals,merged,\
 	lcms2 \
 	libxml2 \
 	$(call gb_Helper_optional,DESKTOP,libxslt) \
+	$(if $(filter-out IOS,$(OS)),mspub) \
+	$(if $(filter-out IOS,$(OS)),mwaw) \
+	mythes \
 	nss3 \
 	openssl \
 	orcus \
-	$(if $(filter-out IOS,$(OS)),\
-	cdr \
-	wpd \
-	wpg \
-	wps \
-	mwaw \
-	mspub \
-	visio) \
+	$(if $(filter-out IOS,$(OS)),wpd) \
+	$(if $(filter-out IOS,$(OS)),wpg) \
+	$(if $(filter-out IOS,$(OS)),wps) \
+	$(if $(filter-out IOS,$(OS)),visio) \
 	zlib \
 ))
 
-# This would be needed on all platforms but only on android we merge libraries from lingucomponent
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_use_externals,merged,\
-	hunspell \
-	expat_utf8 \
-	mythes \
-	hyphen \
-))
 $(eval $(call gb_Library_use_static_libraries,merged,\
 	sax_shared \
 	ulingu \
 ))
-endif
 
 ifeq ($(ENABLE_GRAPHITE),TRUE)
 $(eval $(call gb_Library_use_externals,merged,\
@@ -167,10 +160,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,merged,\
 endif
 
 ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_use_static_libraries,merged,\
-	basebmp \
-))
-
 $(eval $(call gb_Library_use_libraries,merged,\
 	libotouch \
 ))
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index f9aa2513d12d..81a85a25e0c3 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -29,6 +29,7 @@ ifeq ($(MERGELIBS),TRUE)
 
 # we link all object files from these libraries into one, merged library
 gb_MERGEDLIBS := \
+	analysis \
 	avmedia \
 	$(if $(filter unx,$(GUIBASE)),basebmp) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,calc) \
@@ -36,7 +37,9 @@ gb_MERGEDLIBS := \
 	chartcore \
 	configmgr \
 	cppcanvas \
+	ctl \
 	cui \
+	date \
 	$(call gb_Helper_optional,DBCONNECTIVITY,dba) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,dbase) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
@@ -46,7 +49,11 @@ gb_MERGEDLIBS := \
 	desktopbe1 \
 	drawinglayer \
 	editeng \
+	embobj \
+	evtatt \
+	fastsax \
 	$(call gb_Helper_optional,DBCONNECTIVITY,file) \
+	fileacc \
 	filterconfig \
 	$(call gb_Helper_optional,DBCONNECTIVITY,flat) \
 	for \
@@ -57,12 +64,16 @@ gb_MERGEDLIBS := \
 	fwi \
 	fwk \
 	fwl \
+	fwm \
 	$(call gb_Helper_optional,DESKTOP,helplinker) \
+	hwp \
+	hyphen \
 	i18npool \
 	i18nutil \
 	$(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \
 	jvmfwk \
 	lng \
+	lnth \
 	localebe1 \
 	localedata_en \
 	localedata_es \
@@ -73,6 +84,7 @@ gb_MERGEDLIBS := \
 	$(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \
 	oox \
 	package2 \
+	pricing \
 	$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,rptui) \
 	$(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \
@@ -86,6 +98,7 @@ gb_MERGEDLIBS := \
 	sfx \
 	sofficeapp \
 	sot \
+	spell \
 	spl \
 	subsequenttest \
 	svl \
@@ -111,29 +124,8 @@ gb_MERGEDLIBS := \
 	writerfilter \
 	xmlscript \
 	xmlsecurity \
-	xo
-
-ifeq ($(OS),ANDROID)
-gb_MERGEDLIBS += \
-	analysis \
-	ctl \
-	date \
-	embobj \
-	evtatt \
-	fastsax \
-	fileacc \
-	for \
-	forui \
-	fwl \
-	fwm \
-	hwp \
-	hyphen \
-	lnth \
-	pricing \
-	spell \
-	xstor \
-
-endif
+	xo \
+	xstor
 
 endif