Use extracted libraries when they're available (#139)

backtrace-library/src/main/java/backtraceio/library/models/nativeHandler/CrashHandlerConfiguration.java

@@ -20,6 +20,8 @@ public class CrashHandlerConfiguration {
     public static final Set<String> UNSUPPORTED_ABIS = new HashSet<String>(Arrays.asList(new String[]{"x86"}));
     private static final String CRASHPAD_DIRECTORY_PATH = "/crashpad";
 
+    private static final String BACKTRACE_NATIVE_LIBRARY_NAME = "libbacktrace-native.so";
+
 
     public Boolean isSupportedAbi() {
         return isSupportedAbi(AbiHelper.getCurrentAbi());
@@ -48,6 +50,7 @@ public List<String> getCrashHandlerEnvironmentVariables(String apkPath, String n
         // extend system-specific environment variables, with variables needed to properly run app_process via crashpad
         File nativeLibraryDirectory = new File(nativeLibraryDirPath);
 
+        String backtraceNativeLibraryPath = getBacktraceNativeLibraryPath(nativeLibraryDirPath, apkPath, arch);
         File allNativeLibrariesDirectory = nativeLibraryDirectory.getParentFile();
         String allPossibleLibrarySearchPaths = TextUtils.join(File.pathSeparator, new String[]{
                 nativeLibraryDirPath,
@@ -56,7 +59,7 @@ public List<String> getCrashHandlerEnvironmentVariables(String apkPath, String n
                 "/data/local"});
 
         environmentVariables.add(String.format("CLASSPATH=%s", apkPath));
-        environmentVariables.add(String.format("%s=%s!/lib/%s/libbacktrace-native.so", BACKTRACE_CRASH_HANDLER, apkPath, arch));
+        environmentVariables.add(String.format("%s=%s", BACKTRACE_CRASH_HANDLER, backtraceNativeLibraryPath));
         environmentVariables.add(String.format("LD_LIBRARY_PATH=%s", allPossibleLibrarySearchPaths));
         environmentVariables.add("ANDROID_DATA=/data");
 
@@ -72,4 +75,15 @@ public String useCrashpadDirectory(String databaseDirectory) {
         }
         return databasePath;
     }
+
+    private String getBacktraceNativeLibraryPath(String nativeLibraryDirPath, String apkPath, String arch) {
+        String backtraceNativeLibraryPath = String.format("%s/%s", nativeLibraryDirPath, BACKTRACE_NATIVE_LIBRARY_NAME);
+        File backtraceNativeLibrary = new File(backtraceNativeLibraryPath);
+
+        // If ndk libraries are already extracted, we shouldn't use libraries from the apk.
+        // Otherwise. We need to find a path in the apk to use compressed libraries from there.
+        return backtraceNativeLibrary.exists()
+                ? backtraceNativeLibraryPath
+                : String.format("%s!/lib/%s/%s", apkPath, arch, BACKTRACE_NATIVE_LIBRARY_NAME);
+    }
 }