native-code: Remove foo_core groups, now only 'core' and 'writer' are used.

Also remove extended_core group. If something from there will be
needed, we will add it another way.
Currently only android/experimental/desktop/Makefile and
ios/CustomTarget_TiledLibreOffice_app.mk are known to do something.

Change-Id: I99936075e35ce98d684581838c0a19dccd83f942

7 files changed, 15 insertions, 65 deletions

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index c9286640fb10..14de6fee070e 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -13,7 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
 	$< \
-		-g extended_core -g writer \
+		-g core -g writer \
 		> $@
 
 copy-stuff:
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index 3a66f713f435..9bcfc1875789 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -14,7 +14,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
 	$< \
-		-g extended_core -g writer \
+		-g core -g writer \
 		> $@
 
 copy-stuff:
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index d75b8f7a19a5..3419eb1ceb7e 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -13,7 +13,7 @@ include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
 	$< -j \
-		-g core -g writer_core \
+		-g core -g writer \
 		> $@
 
 # The name of the Bootstrap activity class
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk
index ec59df0d4f17..2e4b6db484d5 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -34,7 +34,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 \
+		-g core -g writer \
 		> $(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 f92f8cf7118c..82a960c11bda 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/TiledLibreOffice))
 $(call gb_CustomTarget_get_target,ios/TiledLibreOffice): $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig) TiledLibreOffice_setup
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
 	$(SRCDIR)/solenv/bin/native-code.py \
-		-g core -g writer_core \
+		-g core -g writer \
 		> $(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 ccf69c7fb38d..bba74298a7ee 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Executable_add_generated_cxxobjects,LibreOffice,\
 $(call gb_CustomTarget_get_workdir,ios/LibreOffice)/native-code.cxx :
 	mkdir -p `dirname $@`
 	$(SRCDIR)/solenv/bin/native-code.py \
-		-g extended_core -g writer \
+		-g core -g writer \
 		> $@
 
 $(eval $(call gb_Executable_add_objcxxobjects,LibreOffice,\
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d67f6400af1a..56c0c71ca18b 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -9,7 +9,7 @@ from __future__ import print_function
 from optparse import OptionParser
 
 # foo_component_getFactory functions are split into groups, so that you could
-# choose e.g. 'extended_core' and 'writer' functionality and through factory_map,
+# choose e.g. 'core' and 'writer' functionality and through factory_map,
 # relevant function sections will be referenced in lo_get_factory_map().
 # That prevents garbage collector to ignore them as unused.
 
@@ -108,95 +108,45 @@ core_constructor_list = [
     "XMLVersionListPersistence_get_implementation",
     ]
 
-extended_core_factory_list = core_factory_list + [
-    ("libanimcorelo.a", "animcore_component_getFactory"),
-    ("libavmedialo.a", "avmedia_component_getFactory"),
-    ("libcanvasfactorylo.a", "canvasfactory_component_getFactory"),
-    ("libchartcorelo.a", "chartcore_component_getFactory"),
-    ("libcuilo.a", "cui_component_getFactory"),
-    ("libembobj.a", "embobj_component_getFactory"),
-    ("libemboleobj.a", "emboleobj_component_getFactory"),
-    ("libevtattlo.a", "evtatt_component_getFactory"),
-    ("libfrmlo.a", "frm_component_getFactory"),
-    ("libfwllo.a", "fwl_component_getFactory"),
-    ("libfwmlo.a", "fwm_component_getFactory"),
-    ("libspllo.a", "spl_component_getFactory"),
-    ("libsvllo.a", "svl_component_getFactory"),
-    ("libsvxcorelo.a", "svxcore_component_getFactory"),
-    ("libtextfdlo.a", "textfd_component_getFactory"),
-    ("libucpexpand1lo.a", "ucpexpand1_component_getFactory"),
-    ("libucppkg1.a", "ucppkg1_component_getFactory"),
-    ("libvcllo.a", "vcl_component_getFactory"),
-    ("libxmlfdlo.a", "xmlfd_component_getFactory"),
-    ("libxoflo.a", "xof_component_getFactory"),
-    ]
-
-extended_core_constructor_list = core_constructor_list + [
-    ]
-
-calc_core_factory_list = [
+calc_factory_list = [
     ("libscdlo.a", "scd_component_getFactory"),
     ("libscfiltlo.a", "scfilt_component_getFactory"),
     ("libsclo.a", "sc_component_getFactory"),
     ]
 
-calc_core_constructor_list = [
-    ]
-
-calc_factory_list = calc_core_factory_list + [
-    ("libanalysislo.a", "analysis_component_getFactory"),
-    ("libdatelo.a", "date_component_getFactory"),
-    ("libpricinglo.a", "pricing_component_getFactory"),
-    ]
-
-calc_constructor_list = calc_core_constructor_list + [
+calc_constructor_list = [
     ]
 
-draw_core_factory_list = [
+draw_factory_list = [
     ("libsddlo.a", "sdd_component_getFactory"),
     ("libsdlo.a", "sd_component_getFactory"),
     ("libsvgfilterlo.a", "svgfilter_component_getFactory"),
     ("libwpftdrawlo.a", "wpftdraw_component_getFactory"),
     ]
 
-draw_core_constructor_list = [
+draw_constructor_list = [
     ]
 
-writer_core_factory_list = [
+writer_factory_list = [
     ("libswdlo.a", "swd_component_getFactory"),
     ("libswlo.a", "sw_component_getFactory"),
     ("libwriterfilterlo.a", "writerfilter_component_getFactory"),
     ]
 
-writer_core_constructor_list = [
-    ]
-
-writer_factory_list = writer_core_factory_list + [
-    ("libhwplo.a", "hwp_component_getFactory"),
-    ("libt602filterlo.a", "t602filter_component_getFactory"),
-    ("libwpftwriterlo.a", "wpftwriter_component_getFactory"),
-    ]
-
-writer_constructor_list = writer_core_constructor_list + [
+writer_constructor_list = [
     ]
 
 factory_map = {
     'core' : core_factory_list,
-    'extended_core' : extended_core_factory_list,
-    'calc_core' : calc_core_factory_list,
     'calc' : calc_factory_list,
-    'draw_core' : draw_core_factory_list,
-    'writer_core' : writer_core_factory_list,
+    'draw' : draw_factory_list,
     'writer' : writer_factory_list,
     }
 
 constructor_map = {
     'core' : core_constructor_list,
-    'extended_core' : extended_core_constructor_list,
-    'calc_core' : calc_core_constructor_list,
     'calc' : calc_constructor_list,
-    'draw_core' : draw_core_constructor_list,
-    'writer_core' : writer_core_constructor_list,
+    'draw' : draw_constructor_list,
     'writer' : writer_constructor_list,
     }