From 480a380a7284d5d59f39aad15fd1a299ba704a2f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 17 Nov 2011 15:16:30 +0200 Subject: Look for libboostrap.uno.so and not bootstrap.uno.so on Android Not sure if we need to be more generic here, and always add a "lib" prefix if not present. Or do the changes to the makefilery take care of it, so that for other UNO components than bootstrap, the name as stored wherever it is stored does contain the "lib" prefix we are forces to use on Android? --- cppuhelper/source/shlib.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'cppuhelper') diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx index 9414e34e3b04..8bce73d851a9 100644 --- a/cppuhelper/source/shlib.cxx +++ b/cppuhelper/source/shlib.cxx @@ -464,7 +464,14 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory( SAL_THROW( (loader::CannotActivateFactoryException) ) { #ifndef IOS - OUString aModulePath( makeComponentPath( rLibName, rPath ) ); + OUString sLibName(rLibName); + +#ifdef ANDROID + if ( rLibName.equals( OUSTR("bootstrap.uno" SAL_DLLEXTENSION) ) ) + sLibName = OUSTR("libbootstrap.uno" SAL_DLLEXTENSION); +#endif + + OUString aModulePath( makeComponentPath( sLibName, rPath ) ); if (! checkAccessPath( &aModulePath )) { throw loader::CannotActivateFactoryException( -- cgit