diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-05 23:11:12 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-06 16:01:07 +0200 |
| commit | 392510d7e483e8c181540dfdbabf4de53e4dcbe1 (patch) | |
| tree | 5890b9627a7a95e5f61bc98ab0622f0de84451fc /cppuhelper | |
| parent | f3fa6d32e0698b99abfc00888a75590693e1d386 (diff) | |
UNO components have the "lib" prefix only on Android
That they do is a leftover hack from before we started using the
DISABLE_DYNLOADING thing on Android, it isn't actually necessary any
more. Earlier when the UNO components were actually dynamic libraries
on Android (too, as on desktop OSes), they *had* to have names
starting with "lib" or they would be silently skipped when
packaging.
Change-Id: I11a4689f316e1ffb640a5c3110c63296d2833a84
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/shlib.cxx | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 348b9704a629..acc4253a426b 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -530,20 +530,33 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( { "bootstrap.uno" SAL_DLLEXTENSION, bootstrap_component_getFactory }, { "bootstrap.uno.a", bootstrap_component_getFactory }, { "libbootstrap.uno.a", bootstrap_component_getFactory }, - // The rest seems to consistently have a "lib" prefix now + + // The .uno ones seems to consistently have a "lib" prefix now for Android, + // but not iOS, hmm. +#ifdef ANDROID { "libconfigmgr.uno.a", configmgr_component_getFactory }, - { "libcomphelp" CPPU_STRINGIFY(CPPU_ENV) ".a", comphelp_component_getFactory }, { "libexpwrap.uno.a", expwrap_component_getFactory }, { "libfastsax.uno.a", fastsax_component_getFactory }, - { "libfilterconfiglo.a", filterconfig1_component_getFactory }, - { "libfwklo.a", fwk_component_getFactory }, { "libi18npool.uno.a", i18npool_component_getFactory }, { "libintrospection.uno.a", introspection_component_getFactory }, { "liblocalebe1.uno.a", localebe1_component_getFactory }, - { "libpackage2.a", package2_component_getFactory }, { "libreflection.uno.a", reflection_component_getFactory }, - { "libsfxlo.a", sfx_component_getFactory }, { "libstocservices.uno.a", stocservices_component_getFactory }, +#else + { "configmgr.uno.a", configmgr_component_getFactory }, + { "expwrap.uno.a", expwrap_component_getFactory }, + { "fastsax.uno.a", fastsax_component_getFactory }, + { "i18npool.uno.a", i18npool_component_getFactory }, + { "introspection.uno.a", introspection_component_getFactory }, + { "localebe1.uno.a", localebe1_component_getFactory }, + { "reflection.uno.a", reflection_component_getFactory }, + { "stocservices.uno.a", stocservices_component_getFactory }, +#endif + { "libcomphelp" CPPU_STRINGIFY(CPPU_ENV) ".a", comphelp_component_getFactory }, + { "libfilterconfiglo.a", filterconfig1_component_getFactory }, + { "libfwklo.a", fwk_component_getFactory }, + { "libpackage2.a", package2_component_getFactory }, + { "libsfxlo.a", sfx_component_getFactory }, { "libsvllo.a", svl_component_getFactory }, { "libtklo.a", tk_component_getFactory }, { "libucb1.a", ucb_component_getFactory }, |