android: Further reduce size of LibreOfficeExperimentalDesktop.apk.

It still seems to work for me.
Probably we do not need more components, but it's small enough for now.

Also add uui into 'core' group.

Change-Id: Ifadea8aa819ed17bbd021a0fa2373e6287e06446

android/experimental/desktop/Makefile

@@ -13,8 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
 	$< -j \
-		-g core -g writer \
-		-s basprov -s dlgprov -s cui -s protocolhandler -s scriptframe -s sb -s spl -s stringresource -s uui -s vbaswobj -s vbaevents \
+		-g core -g writer_core \
 		> $@
 
 # The name of the Bootstrap activity class

ios/CustomTarget_MobileLibreOffice_app.mk

@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_target,ios/MobileLibreOffice): $(call gb_CustomTarget
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
 	$(SRCDIR)/solenv/bin/native-code.py \
 		-g extended_core -g writer \
-		-s cui -s spl -s uui \
+		-s cui -s spl \
 		> $(SRCDIR)/ios/shared/ios_sharedlo/cxx/native-code.mm
 	$(call MobileLibreOfficeXcodeBuild, clean build)
 

ios/CustomTarget_TiledLibreOffice_app.mk

@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_target,ios/TiledLibreOffice): $(call gb_CustomTarget_
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
 	$(SRCDIR)/solenv/bin/native-code.py \
 		-g extended_core -g writer \
-		-s cui -s spl -s uui \
+		-s cui -s spl \
 		> $(SRCDIR)/ios/experimental/TiledLibreOffice/TiledLibreOffice/native-code.mm
 	$(call TiledLibreOfficeXcodeBuild, clean build)
 

ios/Executable_LibreOffice.mk

@@ -29,7 +29,7 @@ $(call gb_CustomTarget_get_workdir,ios/LibreOffice)/native-code.cxx :
 	mkdir -p `dirname $@`
 	$(SRCDIR)/solenv/bin/native-code.py \
 		-g extended_core -g writer \
-		-s cui -s spl -s uui \
+		-s cui -s spl \
 		> $@
 
 $(eval $(call gb_Executable_add_objcxxobjects,LibreOffice,\

solenv/bin/native-code.py

@@ -52,6 +52,7 @@ core_factory_list = [
     ("libunordflo.a", "unordf_component_getFactory"),
     ("libunoxmllo.a", "unoxml_component_getFactory"),
     ("libutllo.a", "utl_component_getFactory"),
+    ("libuuilo.a", "uui_component_getFactory"),
     ("libvcllo.a", "vcl_component_getFactory"),
     ("libxmlsecurity.a", "xmlsecurity_component_getFactory"),
     ("libxolo.a", "xo_component_getFactory"),
@@ -131,20 +132,10 @@ core_constructor_list = [
 # sax/source/expatwrap/expwrap.component
     "com_sun_star_comp_extensions_xml_sax_ParserExpat",
     "com_sun_star_comp_extensions_xml_sax_FastParser",
-    "com_sun_star_extensions_xml_sax_Writer",
-# stoc/util/bootstrap.component
-    "com_sun_star_comp_stoc_DLLComponentLoader",
-    "com_sun_star_comp_stoc_ImplementationRegistration",
-    "com_sun_star_comp_stoc_NestedRegistry",
-    "com_sun_star_comp_stoc_ORegistryServiceManager",
-    "com_sun_star_comp_stoc_OServiceManager",
-    "com_sun_star_comp_stoc_OServiceManagerWrapper",
-    "com_sun_star_comp_stoc_SimpleRegistry",
-    "com_sun_star_security_comp_stoc_AccessController",
-    "com_sun_star_security_comp_stoc_FilePolicy",
+# svtools/util/svt.component
+    "com_sun_star_comp_graphic_GraphicProvider_get_implementation",
 # svx/util/svx.component
-# FIXME: what is missing ?
-    "com_sun_star_drawing_SvxShapeCollection_implementation_getFactory",
+    "com_sun_star_drawing_EnhancedCustomShapeEngine_implementation_getFactory",
     ]
 
 # Components which are not in any group yet:
@@ -157,7 +148,6 @@ single_component_map = {
     'sb' : ("libsblo.a", "sb_component_getFactory"),
     'spl' : ("libspllo.a", "spl_component_getFactory"),
     'stringresource' :("libstringresourcelo.a", "stringresource_component_getFactory"),
-    'uui' : ("libuuilo.a", "uui_component_getFactory"),
     'vbaswobj' : ("libvbaswobjlo.a", "vbaswobj_component_getFactory"),
     'vbaevents' : ("libvbaeventslo.a", "vbaevents_component_getFactory"),
     }