dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update for new joint arm+x86 build release

This commit is contained in:
Nathan Freitas 2016-11-03 17:28:01 -04:00
parent 2a0145693d
commit 0efbb1729e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/Makefile vendored
View File

@ -23,7 +23,7 @@ endif
# Android NDK setup # Android NDK setup
ANDROID_NDK_HOME ?= /opt/android-ndk ANDROID_NDK_HOME ?= /opt/android-ndk
NDK_PLATFORM_LEVEL ?= 21 NDK_PLATFORM_LEVEL ?= 16
NDK_TOOLCHAIN_VERSION=4.9 NDK_TOOLCHAIN_VERSION=4.9
APP_ABI ?= armeabi APP_ABI ?= armeabi
NDK_ABI ?= $(APP_ABI) NDK_ABI ?= $(APP_ABI)

2
orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
View File

@ -134,7 +134,7 @@ public interface TorServiceConstants {
public static final String CMD_SET_EXIT = "setexit"; public static final String CMD_SET_EXIT = "setexit";
public static final String BINARY_TOR_VERSION = "0.2.8.9a"; public static final String BINARY_TOR_VERSION = "0.2.8.9armx86";
public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED";
//obfsproxy //obfsproxy

4
orbotservice/src/main/jni/Application.mk
View File

@ -1,4 +1,4 @@
APP_ABI := armeabi armeabi-v7a arm64-v8a APP_ABI := armeabi armeabi-v7a arm64-v8a x86
APP_PLATFORM := android-23 APP_PLATFORM := android-16
APP_STL := stlport_static APP_STL := stlport_static
NDK_TOOLCHAIN_VERSION := 4.9 NDK_TOOLCHAIN_VERSION := 4.9