Kaydet (Commit) 480a380a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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?
üst f95c3e0e
......@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment