summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-03-02 12:36:25 +0100
committerArne Schwabe <arne@rfc2549.org>2014-03-02 12:36:25 +0100
commit9acdcd21843cd194e280d39c8a0ea52f92a377ca (patch)
treeafd713d215ddbb5517beabc14ee03654f4aaad95 /main
parentfca9ba79d9e6206698c7954724dfca0cfa228dda (diff)
Minor fixes
Diffstat (limited to 'main')
-rwxr-xr-xmain/misc/build-native.sh6
-rw-r--r--main/openvpn/config-version.h2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/fragments/Utils.java1
3 files changed, 6 insertions, 3 deletions
diff --git a/main/misc/build-native.sh b/main/misc/build-native.sh
index 37648bd1..52cb18aa 100755
--- a/main/misc/build-native.sh
+++ b/main/misc/build-native.sh
@@ -22,7 +22,11 @@ if [ -d openvpn/.git ]; then
cd ..
fi
-ndk-build APP_API=all -j 8
+if [ "x$1" = "x" ]; then
+ ndk-build APP_API=all -j 8
+else
+ ndk-build $@
+fi
if [ $? = 0 ]; then
rm -rf ovpnlibs/
diff --git a/main/openvpn/config-version.h b/main/openvpn/config-version.h
index 590cc07b..3b3c7918 100644
--- a/main/openvpn/config-version.h
+++ b/main/openvpn/config-version.h
@@ -1,2 +1,2 @@
-#define CONFIGURE_GIT_REVISION "icsopenvpn_70-5bf4db9f5bf243fa"
+#define CONFIGURE_GIT_REVISION "icsopenvpn_70-078981e61dfdf105"
#define CONFIGURE_GIT_FLAGS ""
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
index 56da017d..bb35a517 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
@@ -19,7 +19,6 @@ import java.util.Vector;
public class Utils {
- @TargetApi(Build.VERSION_CODES.KITKAT)
public static Intent getFilePickerIntent(FileType fileType) {
Intent i = new Intent(Intent.ACTION_GET_CONTENT);
i.addCategory(Intent.CATEGORY_OPENABLE);