Module: wine Branch: master Commit: 6d00838e1137e6c248afea6005375c569c055a95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d00838e1137e6c248afea600...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Apr 28 11:42:04 2021 +0200
wineandroid: Load ntdll from the architecture-specific directory.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wineandroid.drv/WineActivity.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 44db8f003db..f9f39dc6c7b 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -97,6 +97,15 @@ public class WineActivity extends Activity 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 @@ public class WineActivity extends Activity
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 );