mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Further reduce size of LibreOfficeExperimentalDesktop.apk.

Browse Source 
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
This commit is contained in:
Matúš Kukan
2013-12-31 17:03:52 +01:00
parent 2b24eec3d4
commit 8d414697d5
5 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/experimental/desktop/Makefile
View File

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

2
ios/CustomTarget_MobileLibreOffice_app.mk
View File

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

2
ios/CustomTarget_TiledLibreOffice_app.mk
View File

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

2
ios/Executable_LibreOffice.mk
View File

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

18
solenv/bin/native-code.py
View File

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