libmerged: another small component libraries for android

Change-Id: Icd36fe58cfe8dbcc737681e6fb477e64310bfaad

Library_merged.mk

@@ -58,8 +58,10 @@ $(eval $(call gb_Library_use_externals,merged,\
 ifeq ($(OS),ANDROID)
 $(eval $(call gb_Library_use_externals,merged,\
 	hunspell \
+	expat_utf8 \
 ))
 $(eval $(call gb_Library_use_static_libraries,merged,\
+	sax_shared \
 	ulingu \
 ))
 $(eval $(call gb_Library_add_libs,merged,\
@@ -153,7 +155,6 @@ $(eval $(call gb_Library_add_libs,merged,\
 $(eval $(call gb_Library_use_externals,merged,\
 	fontconfig \
 	freetype \
-	expat_utf8 \
 ))
 endif
 

android/experimental/DocumentLoader/Makefile

@@ -51,20 +51,14 @@ copy-stuff:
 # them.
 #
 	for F in $(strip \
-		   analysislo \
 		   basegfxlo \
 		   bootstrap.uno \
 		   comphelpgcc3 \
-		   ctllo \
-		   datelo \
 		   dbaxmllo \
 		   dbtoolslo \
-		   evtattlo \
 		   expwrap.uno \
-		   fastsax.uno \
 		   frmlo \
 		   gcc3_uno \
-		   hwplo \
 		   i18nisolang1gcc3 \
 		   icudatalo \
 		   icui18nlo \

android/experimental/LibreOffice4Android/Makefile

@@ -20,24 +20,16 @@ copy-stuff:
 # them.
 #
 	for F in $(strip \
-		   analysislo \
 		   basegfxlo \
 		   bootstrap.uno \
 		   chartcontrollerlo \
 		   chartcorelo \
 		   comphelpgcc3 \
-		   cppcanvaslo \
-		   ctllo \
-		   datelo \
 		   dbaxmllo \
 		   dbtoolslo \
-		   embobj \
-		   evtattlo \
 		   expwrap.uno \
-		   fastsax.uno \
 		   frmlo \
 		   gcc3_uno \
-		   hwplo \
 		   i18nisolang1gcc3 \
 		   icudatalo \
 		   icui18nlo \

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -70,11 +70,18 @@ gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes)
 
 ifeq ($(OS),ANDROID)
 gb_MERGEDLIBS += \
+	analysis \
+	ctl \
+	date \
+	embobj \
+	evtatt \
+	fastsax \
 	fileacc \
 	for \
 	forui \
 	fwl \
 	fwm \
+	hwp \
 	hyphen \
 	lnth \
 	spell \