native code generator: Further reduce 'core' components.

And bin few duplicated ones.

Change-Id: I55a0584adf6f9490e3becee626db388dcb73a228

1 files changed, 9 insertions, 12 deletions

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 603a849d11b5..02a607eeacdc 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -17,19 +17,15 @@ from optparse import OptionParser
 # referenced in lo_get_constructor_map().
 
 core_factory_list = [
-    ("libembobj.a", "embobj_component_getFactory"),
-    ("libemboleobj.a", "emboleobj_component_getFactory"),
     ("libintrospectionlo.a", "introspection_component_getFactory"),
     ("libreflectionlo.a", "reflection_component_getFactory"),
     ("libstocserviceslo.a", "stocservices_component_getFactory"),
     ("libcomphelper.a", "comphelp_component_getFactory"),
     ("libconfigmgrlo.a", "configmgr_component_getFactory"),
     ("libdeployment.a", "deployment_component_getFactory"),
-    ("libevtattlo.a", "evtatt_component_getFactory"),
     ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
     ("libfsstoragelo.a", "fsstorage_component_getFactory"),
     ("libfwklo.a", "fwk_component_getFactory"),
-    ("libfwllo.a", "fwl_component_getFactory"),
     ("libhyphenlo.a", "hyphen_component_getFactory"),
     ("libi18npoollo.a", "i18npool_component_getFactory"),
     ("liblnglo.a", "lng_component_getFactory"),
@@ -40,20 +36,16 @@ core_factory_list = [
     ("libsfxlo.a", "sfx_component_getFactory"),
     ("libsotlo.a", "sot_component_getFactory"),
     ("libspelllo.a", "spell_component_getFactory"),
-    ("libsvllo.a", "svl_component_getFactory"),
     ("libsvtlo.a", "svt_component_getFactory"),
     ("libtklo.a", "tk_component_getFactory"),
     ("libucb1.a", "ucb_component_getFactory"),
-    ("libucpexpand1lo.a", "ucpexpand1_component_getFactory"),
     ("libucpfile1.a", "ucpfile_component_getFactory"),
     ("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"),
-    ("libxoflo.a", "xof_component_getFactory"),
     ("libxstor.a", "xstor_component_getFactory"),
     ]
 
@@ -72,16 +64,21 @@ extended_core_factory_list = core_factory_list + [
     ("libavmedialo.a", "avmedia_component_getFactory"),
     ("libchartcorelo.a", "chartcore_component_getFactory"),
     ("libcuilo.a", "cui_component_getFactory"),
-    ("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
+    ("libembobj.a", "embobj_component_getFactory"),
+    ("libemboleobj.a", "emboleobj_component_getFactory"),
+    ("libevtattlo.a", "evtatt_component_getFactory"),
     ("libfrmlo.a", "frm_component_getFactory"),
-    ("libfwklo.a", "fwk_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"),
-    ("libtklo.a", "tk_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 + [
@@ -134,7 +131,6 @@ math_constructor_list = [
 writer_core_factory_list = [
     ("libswdlo.a", "swd_component_getFactory"),
     ("libswlo.a", "sw_component_getFactory"),
-    ("libwriterfilterlo.a", "writerfilter_component_getFactory"),
     ]
 
 writer_core_constructor_list = [
@@ -144,6 +140,7 @@ writer_factory_list = writer_core_factory_list + [
     ("libhwplo.a", "hwp_component_getFactory"),
     ("libt602filterlo.a", "t602filter_component_getFactory"),
     ("libwpftwriterlo.a", "wpftwriter_component_getFactory"),
+    ("libwriterfilterlo.a", "writerfilter_component_getFactory"),
     ]
 
 writer_constructor_list = writer_core_constructor_list + [