From 016c2b5baddc374bebb606d3bcbef559c1bc7588 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 11 May 2012 17:14:19 +0200
Subject: Add native dir approach from
 http://stackoverflow.com/questions/10517016/android-get-jni-library-dir/10536284

---
 src/de/blinkt/openvpn/OpenVPNThread.java  | 10 ++++++++--
 src/de/blinkt/openvpn/OpenVpnService.java |  3 ++-
 src/de/blinkt/openvpn/VpnProfile.java     |  4 ++++
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/de/blinkt/openvpn')

diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/de/blinkt/openvpn/OpenVPNThread.java
index ce332677..4c00707b 100644
--- a/src/de/blinkt/openvpn/OpenVPNThread.java
+++ b/src/de/blinkt/openvpn/OpenVPNThread.java
@@ -13,11 +13,13 @@ public class OpenVPNThread implements Runnable {
 	private OpenVpnService mService;
 	private String[] mArgv;
 	private Process mProcess;
+	private String mNativeDir;
 
-	public OpenVPNThread(OpenVpnService service,String[] argv)
+	public OpenVPNThread(OpenVpnService service,String[] argv, String nativelibdir)
 	{
 		mService = service;
 		mArgv = argv;
+		mNativeDir = nativelibdir;
 	}
 	
 	public void stopProcess() {
@@ -76,11 +78,15 @@ public class OpenVPNThread implements Runnable {
 		String applibpath = argv[0].replace("/cache/minivpn", "/lib");
 		
 		String lbpath = pb.environment().get("LD_LIBRARY_PATH");
-		if(lbpath==null)
+		if(lbpath==null) 
 			lbpath = applibpath;
 		else
 			lbpath = lbpath + ":" + applibpath;
 		
+		if (!applibpath.equals(mNativeDir)) {
+			lbpath = lbpath + ":" + mNativeDir;
+		}
+		
 		pb.environment().put("LD_LIBRARY_PATH", lbpath);
 		pb.redirectErrorStream(true);
 		try {
diff --git a/src/de/blinkt/openvpn/OpenVpnService.java b/src/de/blinkt/openvpn/OpenVpnService.java
index ad20737b..fb60d84c 100644
--- a/src/de/blinkt/openvpn/OpenVpnService.java
+++ b/src/de/blinkt/openvpn/OpenVpnService.java
@@ -148,6 +148,7 @@ public class OpenVpnService extends VpnService implements Handler.Callback {
 		// Extract information from the intent.
 		String prefix = getPackageName();
 		String[] argv = intent.getStringArrayExtra(prefix + ".ARGV");
+		String nativelibdir = intent.getStringExtra(prefix + ".nativelib");
 
 		String profileUUID = intent.getStringExtra(prefix + ".profileUUID");
 		mProfile = ProfileManager.get(profileUUID);
@@ -191,7 +192,7 @@ public class OpenVpnService extends VpnService implements Handler.Callback {
 
 		// Start a new session by creating a new thread.
 
-		OpenVPNThread serviceThread = new OpenVPNThread(this, argv);
+		OpenVPNThread serviceThread = new OpenVPNThread(this, argv,nativelibdir);
 
 		mServiceThread = new Thread(serviceThread, "OpenVPNServiceThread");
 		mServiceThread.start();
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/de/blinkt/openvpn/VpnProfile.java
index b3ce6a47..639619ff 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/de/blinkt/openvpn/VpnProfile.java
@@ -19,6 +19,7 @@ import java.util.Vector;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.security.KeyChain;
 import android.security.KeyChainException;
 
@@ -385,6 +386,9 @@ public class VpnProfile implements  Serializable{
 
 		intent.putExtra(prefix + ".ARGV" , buildOpenvpnArgv(context.getCacheDir()));
 		intent.putExtra(prefix + ".profileUUID", mUuid.toString());
+		
+		ApplicationInfo info = context.getApplicationInfo();
+		intent.putExtra(prefix +".nativelib",info.nativeLibraryDir);
 
 		try {
 			FileWriter cfg = new FileWriter(context.getCacheDir().getAbsolutePath() + "/" + OVPNCONFIGFILE);
-- 
cgit v1.2.3