diff --git a/.project b/.project
index 3c3e6b98..2db7e219 100644
--- a/.project
+++ b/.project
@@ -5,6 +5,12 @@
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+
org.eclipse.wst.jsdt.core.javascriptValidator
@@ -30,10 +36,20 @@
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
org.eclipse.wst.jsdt.core.jsNature
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.core.ccnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
diff --git a/AndroidManifest.KITKAT_AND_LOWER.xml b/AndroidManifest.KITKAT_AND_LOWER.xml
index 2e9aa21e..5ba968dd 100644
--- a/AndroidManifest.KITKAT_AND_LOWER.xml
+++ b/AndroidManifest.KITKAT_AND_LOWER.xml
@@ -3,17 +3,17 @@
package="org.torproject.android"
android:versionName="14.1.4-noPIE"
android:versionCode="132"
- android:installLocation="auto"
+ android:installLocation="auto"
>
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/AndroidManifest.LOLLIPOP.xml b/AndroidManifest.LOLLIPOP.xml
index 302aeeba..70841f40 100644
--- a/AndroidManifest.LOLLIPOP.xml
+++ b/AndroidManifest.LOLLIPOP.xml
@@ -3,17 +3,17 @@
package="org.torproject.android"
android:versionName="14.1.4-PIE"
android:versionCode="133"
- android:installLocation="auto"
+ android:installLocation="auto"
>
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2e9aa21e..c8cc1f4e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,21 +1,21 @@
-
+
-
+
-
+
-
-
+
+
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/bcdroid.manifest b/bcdroid.manifest
index e3467bb0..b6b37f4e 100644
--- a/bcdroid.manifest
+++ b/bcdroid.manifest
@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
-Sealed: true
-
+Manifest-Version: 1.0
+Sealed: true
+
diff --git a/external/Makefile b/external/Makefile
index 999c24d1..df7de72c 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -16,14 +16,14 @@ EXTERNAL_ROOT := $(shell pwd)
# user building this will have to manually set NDK_PROCESSOR or NDK_TOOLCHAIN.
CPU := $(shell uname -m)
ifeq ($(CPU),x86_64)
- NDK_PROCESSOR=x86_64
+ NDK_PROCESSOR=x86
else
NDK_PROCESSOR=x86
endif
# Android NDK setup
NDK_BASE ?= /opt/android-ndk
-NDK_PLATFORM_LEVEL ?= 9
+NDK_PLATFORM_LEVEL ?= 19
NDK_ABI ?= arm
NDK_TOOLCHAIN_VERSION=4.8
NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI)
diff --git a/external/appcompat/.classpath b/external/appcompat/.classpath
index 2566cbd4..fb2265b7 100644
--- a/external/appcompat/.classpath
+++ b/external/appcompat/.classpath
@@ -2,10 +2,10 @@
-
-
+
+
diff --git a/jni/Android.mk b/jni/Android.mk
index edd247b4..4eb1e785 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,3 +1,3 @@
##include ../OriginalDest/Android.mk
-##include ../external/badvpn/Android.mk
+include ./external/badvpn/Android.mk
##include ../kalium-jni/jni/Android.mk
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 3c592b2f..8ac6bdea 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -36,7 +36,7 @@
android:id="@+id/menu_verify_list"
android:title="@string/menu_verify"
android:icon="@drawable/ic_action_browse"
- yourapp:showAsAction="always"
+ yourapp:showAsAction="always"
>