[tor-commits] [orbot/master] update for new joint arm+x86 build release

[n8fr8 at torproject.org]

commit 0efbb1729e8cc36c1e8711310749714f1ca01bfc
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Nov 3 17:28:01 2016 -0400

    update for new joint arm+x86 build release
---
 external/Makefile                                                     | 2 +-
 .../main/java/org/torproject/android/service/TorServiceConstants.java | 2 +-
 orbotservice/src/main/jni/Application.mk                              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 319b99e..fc96ead 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -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)
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
index 767f17a..4a9c14d 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
@@ -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 
diff --git a/orbotservice/src/main/jni/Application.mk b/orbotservice/src/main/jni/Application.mk
index 146bb44..5f3200f 100644
--- a/orbotservice/src/main/jni/Application.mk
+++ b/orbotservice/src/main/jni/Application.mk
@@ -1,4 +1,4 @@
-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