[Libreoffice-commits] core.git: cppuhelper/source

[Tor Lillqvist]

 cppuhelper/source/shlib.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit ecb1850b2d32e509050be9a323cf124fe2af5277
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 3 14:39:06 2013 +0300

    Can unify this now it seems
    
    Change-Id: I2fd0e1967028ad6632b39dfaaf377c7186a89229

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index f61f2bc..fc8b6a8 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -535,17 +535,9 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
         { "bootstrap.uno.a", bootstrap_component_getFactory },
         { "libbootstraplo.a", bootstrap_component_getFactory },
 
-        // The .uno ones seem to consistently have a "lib" prefix now for Android,
-        // but not iOS, hmm.
-#ifdef ANDROID
         { "libintrospectionlo.a", introspection_component_getFactory },
         { "libreflectionlo.a", reflection_component_getFactory },
         { "libstocserviceslo.a", stocservices_component_getFactory },
-#else
-        { "introspection.uno.a", introspection_component_getFactory },
-        { "reflection.uno.a", reflection_component_getFactory },
-        { "stocservices.uno.a", stocservices_component_getFactory },
-#endif
         { "libcomphelper.a", comphelp_component_getFactory },
         { "libconfigmgrlo.a", configmgr_component_getFactory },
         { "libdeployment.a", deployment_component_getFactory },