vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

android: implement better way to get JNI libraries directory

Browse source
This commit is contained in:
Alibek Omarov 2019-12-03 03:46:14 +03:00
parent ad3157e940
commit a8f3701e92
2 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
android/src/su/xash/engine/XashActivity.java
View file

@ -487,11 +487,24 @@ public class XashActivity extends Activity {
mEngineReady = true; mEngineReady = true;
} }
private boolean setupEnvironment() private boolean setupEnvironment()
{ {
Intent intent = getIntent(); Intent intent = getIntent();
final String enginedir = getFilesDir().getParentFile().getPath() + "/lib";
String enginedir;
try
{
ApplicationInfo ai = FWGSLib.getApplicationInfo(this, null, 0);
enginedir = ai.nativeLibraryDir;
}
catch(Exception e)
{
e.printStackTrace();
enginedir = getFilesDir().getParentFile().getPath() + "/lib";
}
String argv = FWGSLib.getStringExtraFromIntent( intent, "argv", mPref.getString( "argv", "-dev 3 -log" ) ); String argv = FWGSLib.getStringExtraFromIntent( intent, "argv", mPref.getString( "argv", "-dev 3 -log" ) );
String gamelibdir = FWGSLib.getStringExtraFromIntent( intent, "gamelibdir", enginedir ); String gamelibdir = FWGSLib.getStringExtraFromIntent( intent, "gamelibdir", enginedir );
String gamedir = FWGSLib.getStringExtraFromIntent( intent, "gamedir", "valve" ); String gamedir = FWGSLib.getStringExtraFromIntent( intent, "gamedir", "valve" );
@ -519,10 +532,15 @@ public class XashActivity extends Activity {
{ {
fGDBSafe = true; fGDBSafe = true;
Log.e( TAG, "GDBSafe mode enabled!" ); Log.e( TAG, "GDBSafe mode enabled!" );
} }
Log.d( TAG, "argv = " + argv );
Log.d( TAG, "gamedir = " + gamedir );
Log.d( TAG, "basedir = " + basedir );
Log.d( TAG, "enginedir = " + enginedir );
Log.d( TAG, "gamelibdir = " + gamelibdir );
mArgv = argv.split( " " ); mArgv = argv.split( " " );
if( mUseRoDir ) if( mUseRoDir )
{ {
@ -541,10 +559,12 @@ public class XashActivity extends Activity {
setenv( "XASH3D_GAMELIBDIR", gamelibdir, true ); setenv( "XASH3D_GAMELIBDIR", gamelibdir, true );
setenv( "XASH3D_GAMEDIR", gamedir, true ); setenv( "XASH3D_GAMEDIR", gamedir, true );
setenv( "XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true ); setenv( "XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true );
Log.d( TAG, "enginepak = " + getFilesDir().getPath() + "/extras.pak" );
String pakfile = intent.getStringExtra( "pakfile" ); String pakfile = intent.getStringExtra( "pakfile" );
if( pakfile != null && pakfile != "" ) if( pakfile != null && pakfile != "" )
setenv( "XASH3D_EXTRAS_PAK2", pakfile, true ); setenv( "XASH3D_EXTRAS_PAK2", pakfile, true );
Log.d( TAG, "pakfile = " + ( pakfile != null ? pakfile : "null" ) );
String[] env = intent.getStringArrayExtra( "env" ); String[] env = intent.getStringArrayExtra( "env" );
if( env != null ) if( env != null )
@ -553,6 +573,7 @@ public class XashActivity extends Activity {
{ {
for( int i = 0; i + 1 < env.length; i += 2 ) for( int i = 0; i + 1 < env.length; i += 2 )
{ {
Log.d(TAG, "extraEnv[" + env[i] + "] = " + env[i + 1]);
setenv( env[i], env[i + 1], true ); setenv( env[i], env[i + 1], true );
} }
} }

10
android/src/su/xash/fwgslib/FWGSLib.java
View file

@ -256,5 +256,15 @@ public class FWGSLib
} }
} }
public static ApplicationInfo getApplicationInfo(Context ctx, String pkgName, int flags) throws PackageManager.NameNotFoundException
{
PackageManager pm = ctx.getPackageManager();
if( pkgName == null )
pkgName = ctx.getPackageName();
return pm.getApplicationInfo(pkgName, flags);
}
public static final int sdk = Integer.valueOf(Build.VERSION.SDK); public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
} }