android/experimental/desktop/native-code.cxx | 14 +++++++-------
cppuhelper/source/shlib.cxx | 3 ++-
2 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit b5fea2f46a1f33af2198e7da0bad027589fce5d2
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Apr 23 19:30:58 2013 +0300
The file names of many UNO components have changed
Change-Id: I18f90b058e40ca15164fd3e8c33bc904b930981d
diff --git a/android/experimental/desktop/native-code.cxx
b/android/experimental/desktop/native-code.cxx
index 3b86d46..d75f426 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -84,17 +84,17 @@ lo_get_libmap(void)
static lib_to_component_mapping map[] = {
{ "libanimcorelo.a", animcore_component_getFactory },
{ "libavmedialo.a", avmedia_component_getFactory },
- { "libbasprov.uno.a", basprov_component_getFactory },
+ { "libbasprovlo.a", basprov_component_getFactory },
{ "libchartcorelo.a", chartcore_component_getFactory },
- { "libdlgprov.uno.a", dlgprov_component_getFactory },
+ { "libdlgprovlo.a", dlgprov_component_getFactory },
{ "libdbalo.a", dba_component_getFactory },
{ "libdbaxmllo.a", dbaxml_component_getFactory },
{ "libcuilo.a", cui_component_getFactory },
{ "libembobj.a", embobj_component_getFactory },
{ "libemboleobj.a", emboleobj_component_getFactory },
{ "libevtattlo.a", evtatt_component_getFactory },
- { "libexpwrap.uno.a", expwrap_component_getFactory },
- { "libfastsax.uno.a", fastsax_component_getFactory },
+ { "libexpwraplo.a", expwrap_component_getFactory },
+ { "libfastsaxlo.a", fastsax_component_getFactory },
{ "libfileacc.a", fileacc_component_getFactory },
{ "libfilterconfiglo.a", filterconfig1_component_getFactory },
{ "libfrmlo.a", frm_component_getFactory },
@@ -122,7 +122,7 @@ lo_get_libmap(void)
{ "libsotlo.a", sot_component_getFactory },
{ "libspelllo.a", spell_component_getFactory },
{ "libscriptframe.a", scriptframe_component_getFactory },
- { "libstringresource.uno.a", stringresource_component_getFactory },
+ { "libstringresourcelo.a", stringresource_component_getFactory },
{ "libsvgfilterlo.a", svgfilter_component_getFactory },
{ "libsvtlo.a", svt_component_getFactory },
{ "libsvxlo.a", svx_component_getFactory },
@@ -136,8 +136,8 @@ lo_get_libmap(void)
{ "libunordflo.a", unordf_component_getFactory },
{ "libunoxmllo.a", unoxml_component_getFactory },
{ "libuuilo.a", uui_component_getFactory },
- { "libvbaswobj.uno.a", vbaswobj_component_getFactory },
- { "libvbaevents.uno.a", vbaevents_component_getFactory },
+ { "libvbaswobjlo.a", vbaswobj_component_getFactory },
+ { "libvbaeventslo.a", vbaevents_component_getFactory },
{ "libwpftdrawlo.a", wpftdraw_component_getFactory },
{ "libwpftwriterlo.a", wpftwriter_component_getFactory },
{ "libwriterfilterlo.a", writerfilter_component_getFactory },
commit 8ada6e3320eaf4635bb695000b7341ed87db67a1
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Apr 23 18:53:19 2013 +0300
libcomphelpgcc3 got renamed to libcomphelper
Change-Id: I8853c5102a7271e95adf7d420bb3ed719f5b96c6
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index a0dcbd3..ad951cd 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -536,6 +536,7 @@ Reference< XInterface > SAL_CALL
loadSharedLibComponentFactory(
// The .uno ones seems to consistently have a "lib" prefix now for
Android,
// but not iOS, hmm.
#ifdef ANDROID
+ { "libcomphelper.a", comphelp_component_getFactory },
{ "libconfigmgr.uno.a", configmgr_component_getFactory },
{ "libexpwrap.uno.a", expwrap_component_getFactory },
{ "libfastsax.uno.a", fastsax_component_getFactory },
@@ -556,7 +557,7 @@ Reference< XInterface > SAL_CALL
loadSharedLibComponentFactory(
{ "stocservices.uno.a", stocservices_component_getFactory },
{ "ucpexpand1.uno.a", ucpexpand1_component_getFactory },
#endif
- { "libcomphelp" CPPU_STRINGIFY(CPPU_ENV) ".a",
comphelp_component_getFactory },
+ { "libcomphelper.a", comphelp_component_getFactory },
{ "libdeployment.a", deployment_component_getFactory },
{ "libfilterconfiglo.a", filterconfig1_component_getFactory },
{ "libfwklo.a", fwk_component_getFactory },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
