summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2013-08-07 23:29:05 +0200
committerArne Schwabe <arne@rfc2549.org>2013-08-07 23:29:05 +0200
commit89fbc2e73b78fb7aaaf3cfbe95185d5f8f1e3cf1 (patch)
tree8e8ba4def76bede94806ceee87ea67e92bf115b8 /src
parent98e81a04548eda145c2cabf8d3a7bd24b74b3971 (diff)
Fix compiling with Android NDK r9
Diffstat (limited to 'src')
-rw-r--r--src/de/blinkt/openvpn/core/NativeUtils.java1
-rw-r--r--src/de/blinkt/openvpn/core/OpenVpnManagementThread.java7
2 files changed, 2 insertions, 6 deletions
diff --git a/src/de/blinkt/openvpn/core/NativeUtils.java b/src/de/blinkt/openvpn/core/NativeUtils.java
index 42d0b583..a2c4796d 100644
--- a/src/de/blinkt/openvpn/core/NativeUtils.java
+++ b/src/de/blinkt/openvpn/core/NativeUtils.java
@@ -7,6 +7,7 @@ public class NativeUtils {
static native void jniclose(int fdint);
static {
+ System.loadLibrary("stlport_shared");
System.loadLibrary("opvpnutil");
}
}
diff --git a/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 2cb6dfe3..e2ac1526 100644
--- a/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -92,11 +92,6 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
}
-
- static {
- System.loadLibrary("opvpnutil");
- }
-
public void managmentCommand(String cmd) {
if(mSocket!=null) {
try {
@@ -162,7 +157,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
private void protectFileDescriptor(FileDescriptor fd) {
Exception exp;
try {
- Method getInt = FileDescriptor.class.getDeclaredMethod("getInt$");
+ Method getInt = FileDescriptor.class.getDeclaredMethod("getInt$");
int fdint = (Integer) getInt.invoke(fd);
// You can even get more evil by parsing toString() and extract the int from that :)