wineandroid: Load ntdll from the architecture-specific directory.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
f2838cc1d4
commit
6d00838e11
|
@ -97,6 +97,15 @@ private String get_wine_abi()
|
|||
return null;
|
||||
}
|
||||
|
||||
private String get_so_dir( String abi )
|
||||
{
|
||||
if (abi.equals( "x86" )) return "/i386-unix";
|
||||
if (abi.equals( "x86_64" )) return "/x86_64-unix";
|
||||
if (abi.equals( "armeabi-v7a" )) return "/arm-unix";
|
||||
if (abi.equals( "arm64-v8a" )) return "/aarch64-unix";
|
||||
return "";
|
||||
}
|
||||
|
||||
private void loadWine( String cmdline )
|
||||
{
|
||||
copyAssetFiles();
|
||||
|
@ -138,7 +147,7 @@ private void loadWine( String cmdline )
|
|||
|
||||
createProgressDialog( 0, "Setting up the Windows environment..." );
|
||||
|
||||
System.load( dlldir.toString() + "/ntdll.so" );
|
||||
System.load( dlldir.toString() + get_so_dir(wine_abi) + "/ntdll.so" );
|
||||
prefix.mkdirs();
|
||||
|
||||
runWine( cmdline, env );
|
||||
|
|
Loading…
Reference in New Issue