Skip to content

Android: resolve APK path for crash handler on split APK / OBB builds #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Android: resolve APK path for crash handler on split APK / OBB builds #262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 84 additions & 4 deletions Runtime/Native/Android/NativeClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,83 @@ private string GuessNativeDirectoryPath()
}
}

/// <summary>
/// Resolve the path to the base APK that contains the Backtrace Java classes.
/// </summary>
private static string GetApkPathForCrashHandler()
{
String applicationDataPath = Application.dataPath;
#if UNITY_ANDROID && !UNITY_EDITOR
try
{
using (AndroidJavaClass unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
{
if (unityPlayer == null)
{
return applicationDataPath;
}

using (AndroidJavaObject activity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity"))
{
if (activity == null)
{
return applicationDataPath;
}

using (AndroidJavaObject context = activity.Call<AndroidJavaObject>("getApplicationContext"))
{
if (context != null)
{
using (AndroidJavaObject applicationInfo = context.Call<AndroidJavaObject>("getApplicationInfo"))
{
if (applicationInfo != null)
{
String sourceDir = applicationInfo.Get<String>("sourceDir");
if (!String.IsNullOrEmpty(sourceDir))
{
return sourceDir;
}
}
}

using (AndroidJavaObject packageManager = context.Call<AndroidJavaObject>("getPackageManager"))
{
if (packageManager != null)
{
String packageName = context.Call<String>("getPackageName");
if (!String.IsNullOrEmpty(packageName))
{
using (AndroidJavaObject pmApplicationInfo = packageManager.Call<AndroidJavaObject>("getApplicationInfo", packageName, 0))
{
if (pmApplicationInfo != null)
{
String pmSourceDir = pmApplicationInfo.Get<String>("sourceDir");
if (!String.IsNullOrEmpty(pmSourceDir))
{
return pmSourceDir;
}
}
}
}
}
}
}
}
}
}
}
catch (Exception e)
{
Debug.LogWarning(String.Format("Backtrace native crash handler: failed to resolve APK path, " + "falling back to Application.dataPath. Reason: {0}", e.Message));
}

return applicationDataPath;
#else
// Editor/non‑Android
return applicationDataPath;
#endif
}

/// <summary>
/// Start crashpad process to handle native Android crashes
/// </summary>
Expand Down Expand Up @@ -287,7 +364,10 @@ private void HandleNativeCrashes(IDictionary<string, string> backtraceAttributes
return;
}

CaptureNativeCrashes = InitializeJavaCrashHandler(minidumpUrl, databasePath, backtraceAttributes["device.abi"], libDirectory, attachments);
// Resolve the APK path
var apkPath = GetApkPathForCrashHandler();

CaptureNativeCrashes = InitializeJavaCrashHandler(minidumpUrl, databasePath, backtraceAttributes["device.abi"], libDirectory, apkPath, attachments);

if (!CaptureNativeCrashes)
{
Expand All @@ -311,7 +391,7 @@ private void HandleNativeCrashes(IDictionary<string, string> backtraceAttributes
AddAttribute(AndroidJNI.NewStringUTF(ErrorTypeAttribute), AndroidJNI.NewStringUTF(CrashType));
}

private bool InitializeJavaCrashHandler(String minidumpUrl, String databasePath, String deviceAbi, String nativeDirectory, IEnumerable<String> attachments) {
private bool InitializeJavaCrashHandler(String minidumpUrl, String databasePath, String deviceAbi, String nativeDirectory, String apkPath, IEnumerable<String> attachments) {
if (String.IsNullOrEmpty(deviceAbi)) {
Debug.LogWarning("Cannot determine device ABI");
return false;
Expand All @@ -326,12 +406,12 @@ private bool InitializeJavaCrashHandler(String minidumpUrl, String databasePath,
// verify if the library is already extracted
var backtraceNativeLibraryPath = Path.Combine(nativeDirectory, _nativeLibraryName);
if (!File.Exists(backtraceNativeLibraryPath)) {
backtraceNativeLibraryPath = string.Format("{0}!/lib/{1}/{2}", Application.dataPath, deviceAbi, _nativeLibraryName);
backtraceNativeLibraryPath = string.Format("{0}!/lib/{1}/{2}", apkPath, deviceAbi, _nativeLibraryName);
}

// prepare native crash handler environment variables
List<String> environmentVariables = new List<string> () {
string.Format("CLASSPATH={0}", Application.dataPath),
string.Format("CLASSPATH={0}", apkPath),
string.Format("BACKTRACE_UNITY_CRASH_HANDLER={0}", backtraceNativeLibraryPath),
string.Format("LD_LIBRARY_PATH={0}", string.Join(":", nativeDirectory, Directory.GetParent(nativeDirectory), GetLibrarySystemPath(), "/data/local")),
"ANDROID_DATA=/data"
Expand Down
Loading