Merge branch 'master' of http://10.6.6.2/zerotier/ZeroTierOne

java/jni/Application.mk

@@ -1,5 +1,5 @@
-NDK_TOOLCHAIN_VERSION := clang
-APP_STL := c++_static
-APP_CPPFLAGS := -O3 -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
+# NDK_TOOLCHAIN_VERSION := clang3.5
+APP_STL := gnustl_static
+APP_CPPFLAGS := -O3 -fPIC -fPIE -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
 APP_PLATFORM := android-14
 APP_ABI := all