Get more --disable-dynamic-loading code out of shlib.cxx.

It's not terribly nice, but, hopefully, better.
The hope is that one day, lo_get_library_map will be no more.
In lo_get_implementation_map we can specify more precisely what to link
into the binary.

Change-Id: I99a1854fbae05be2f70302cc56bea88e522ec129

2 files changed, 29 insertions, 4 deletions

diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm
index 18cf09f04587..5da9455f96a0 100644
--- a/ios/experimental/LibreOffice/LibreOffice/lo.mm
+++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm
@@ -18,9 +18,10 @@
 
 extern "C"
 const lib_to_component_mapping *
-lo_get_libmap(void)
+lo_get_library_map(void)
 {
     static lib_to_component_mapping map[] = {
+        NON_APP_SPECIFIC_COMPONENT_MAP
         { "libanalysislo.a", analysis_component_getFactory },
         { "libanimcorelo.a", animcore_component_getFactory },
         { "libavmedialo.a", avmedia_component_getFactory },
@@ -81,6 +82,18 @@ lo_get_libmap(void)
 }
 
 extern "C"
+const lib_to_component_mapping *
+lo_get_implementation_map(void)
+{
+    static lib_to_component_mapping map[] = {
+        NON_APP_SPECIFIC_DIRECT_COMPONENT_MAP
+        { NULL, NULL }
+    };
+
+    return map;
+}
+
+extern "C"
 void
 lo_initialize(void)
 {
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm b/ios/shared/ios_sharedlo/cxx/mlo.mm
index 61f56b2f8481..6dc4ad1a7bc6 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -24,10 +24,11 @@
 
 extern "C"
 const lib_to_component_mapping *
-lo_get_libmap(void)
+lo_get_library_map(void)
 {
     static lib_to_component_mapping map[] = {
-        
+        NON_APP_SPECIFIC_COMPONENT_MAP
+
         //from IOS
         
         //MAP_LIB_LO(analysis), //MAP_LIB_LO(animcore), //MAP_LIB_LO(sm),
@@ -68,10 +69,21 @@ lo_get_libmap(void)
         
         { NULL, NULL }
     };
-    
+
     return map;
 }
 
+extern "C"
+const lib_to_component_mapping *
+lo_get_implementation_map(void)
+{
+    static lib_to_component_mapping map[] = {
+        NON_APP_SPECIFIC_DIRECT_COMPONENT_MAP
+        { NULL, NULL }
+    };
+
+    return map;
+}
 
 NSString * createPaths(NSString * base,NSString * appRootEscaped,NSArray * fileNames){
     NSString * prefix = @"file://";