[Libreoffice-commits] core.git: 2 commits - android/experimental cppuhelper/source ios/CustomTarget_MobileLibreOffice_app.mk ios/CustomTarget_TiledLibreOffice_app.mk ios/Executable_LibreOffice.mk solenv/bin

[Matúš Kukan]

 android/experimental/desktop/Makefile     |    3 +--
 cppuhelper/source/shlib.cxx               |    4 +---
 ios/CustomTarget_MobileLibreOffice_app.mk |    2 +-
 ios/CustomTarget_TiledLibreOffice_app.mk  |    2 +-
 ios/Executable_LibreOffice.mk             |    2 +-
 solenv/bin/native-code.py                 |   18 ++++--------------
 6 files changed, 9 insertions(+), 22 deletions(-)

New commits:
commit 202ea1975ca0e4ecdc6c175aaed2537bda3ac847
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Wed Jan 1 18:54:50 2014 +0100

    Only component-mapping.h is needed here.
    
    Change-Id: I09fc944d7d19e8a2804d8530ba2a98b5719d8b37

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index f34fa8e..1d41440 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -31,9 +31,7 @@
 
 #include <loadsharedlibcomponentfactory.hxx>
 
-#if defined ANDROID
-#include <osl/detail/android-bootstrap.h>
-#elif defined IOS
+#if defined DISABLE_DYNLOADING
 #include <osl/detail/component-mapping.h>
 #endif
 
commit 8d414697d5e49fd42650b7b1472512c72f544c7c
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Dec 31 17:03:52 2013 +0100

    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

diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index 90a8b7a..b2d55f9 100644
--- a/android/experimental/desktop/Makefile
+++ b/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
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk
index 25b044d..cb25385 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/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)
 
diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk
index 7a280e2..5097f0d 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/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)
 
diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index 6f63c28..f35b9cb 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/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,\
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 54a9abe..065772e 100755
--- a/solenv/bin/native-code.py
+++ b/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"),
     }