merge more, mostly small libraries for android

Change-Id: Ic40dec7083b2dd83952bee50290b803b981965b0

Library_merged.mk

@@ -54,6 +54,20 @@ $(eval $(call gb_Library_use_externals,merged,\
 	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 \
+))
+$(eval $(call gb_Library_use_static_libraries,merged,\
+	ulingu \
+))
+$(eval $(call gb_Library_add_libs,merged,\
+	$(if $(filter MSC,$(COM)),libmythes.lib,-lmythes-1.2) \
+	$(if $(filter MSC,$(COM)),hyphen.lib,-lhyphen) \
+))
+endif
+
 ifeq ($(ENABLE_GRAPHITE),TRUE)
 $(eval $(call gb_Library_use_externals,merged,\
 	graphite \

android/experimental/DocumentLoader/Makefile

@@ -62,8 +62,6 @@ copy-stuff:
 		   evtattlo \
 		   expwrap.uno \
 		   fastsax.uno \
-		   forlo \
-		   foruilo \
 		   frmlo \
 		   gcc3_uno \
 		   hwplo \
@@ -120,7 +118,6 @@ copy-stuff:
 		   xmlreader \
 		   xmlsecurity \
 		   xslt \
-		   xstor \
 		  ); do \
 	    $(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
 	done

android/experimental/LibreOffice4Android/Makefile

@@ -35,12 +35,9 @@ copy-stuff:
 		   evtattlo \
 		   expwrap.uno \
 		   fastsax.uno \
-		   forlo \
-		   foruilo \
 		   frmlo \
 		   gcc3_uno \
 		   hwplo \
-		   hyphenlo \
 		   i18nisolang1gcc3 \
 		   icudatalo \
 		   icui18nlo \
@@ -53,7 +50,6 @@ copy-stuff:
 		   jvmaccessgcc3 \
 		   jvmfwk \
 		   libotouchlo \
-		   lnthlo \
 		   lo-bootstrap \
 		   localedata_en \
 		   localedata_es \
@@ -73,7 +69,6 @@ copy-stuff:
 		   sdlo \
 		   sddlo \
 		   smdlo \
-		   spelllo \
 		   stocservices.uno \
 		   store \
 		   svgfilterlo \
@@ -102,7 +97,6 @@ copy-stuff:
 		   xmlsecurity \
 		   xoflo \
 		   xslt \
-		   xstor \
 		  ); do \
 	    $(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
 	done

android/qa/desktop/Makefile

@@ -98,10 +98,7 @@ copy-stuff: buildrcs
 		  cppcanvaslo \
 		  embobj \
 		  expwrap.uno \
-		  forlo \
-		  foruilo \
 		  gcc3_uno \
-		  hyphenlo \
 		  i18nisolang1gcc3 \
 		  icudatalo \
 		  icui18nlo \
@@ -111,7 +108,6 @@ copy-stuff: buildrcs
 		  jvmfwk \
 		  libotouchlo \
 		  introspection.uno \
-		  lnthlo \
 		  localedata_en \
 		  localedata_es \
 		  localedata_euro \
@@ -121,7 +117,6 @@ copy-stuff: buildrcs
 		  ooxlo \
 		  reflection.uno \
 		  reg \
-		  spelllo \
 		  stocservices.uno \
 		  store \
 		  test \
@@ -139,7 +134,6 @@ copy-stuff: buildrcs
 		  xmlreader \
 		  xmlsecurity \
 		  xslt \
-		  xstor \
 		  \
 		  swlo \
 		  swuilo \

android/qa/sc/Makefile

@@ -67,8 +67,6 @@ copy-stuff:
 		  datelo \
 		  expwrap.uno \
 		  fastsax.uno \
-		  forlo \
-		  foruilo \
 		  frmlo \
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
@@ -106,7 +104,6 @@ copy-stuff:
 		  vbahelperlo \
 		  xml2 \
 		  xmlreader \
-		  xstor \
 		  ); do \
 	    $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
 	done

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -71,8 +71,14 @@ gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes)
 ifeq ($(OS),ANDROID)
 gb_MERGEDLIBS += \
 	fileacc \
+	for \
+	forui \
 	fwl \
 	fwm \
+	hyphen \
+	lnth \
+	spell \
+	xstor \
 
 endif