Commit 0efbb172 authored by Nathan Freitas's avatar Nathan Freitas
Browse files

update for new joint arm+x86 build release

parent 2a014569

external/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ endif 


# Android NDK setup

ANDROID_NDK_HOME ?= /opt/android-ndk

NDK_PLATFORM_LEVEL ?= 21

NDK_PLATFORM_LEVEL ?= 16

NDK_TOOLCHAIN_VERSION=4.9

APP_ABI ?= armeabi

NDK_ABI ?= $(APP_ABI)

orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public interface TorServiceConstants { 
    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";

    

    //obfsproxy

orbotservice/src/main/jni/Application.mk

+2 −2
Original line number Diff line number Diff line 
APP_ABI      			:= armeabi armeabi-v7a arm64-v8a

APP_PLATFORM 			:= android-23

APP_ABI      			:= armeabi armeabi-v7a arm64-v8a x86

APP_PLATFORM 			:= android-16

APP_STL      			:= stlport_static

NDK_TOOLCHAIN_VERSION 	:= 4.9