From 89ddc2f7c98b369786ef704c9a2423c23895fb5b Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 17 May 2017 13:19:38 +0800 Subject: [PATCH] Use standard __ANDROID__ preprocessor macro --- mobile/src/main/jni/Android.mk | 4 ++-- mobile/src/main/jni/badvpn | 2 +- mobile/src/main/jni/libev | 2 +- mobile/src/main/jni/libevent | 2 +- mobile/src/main/jni/redsocks | 2 +- mobile/src/main/jni/shadowsocks-libev | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mobile/src/main/jni/Android.mk b/mobile/src/main/jni/Android.mk index 90dcdf52..548fe90f 100755 --- a/mobile/src/main/jni/Android.mk +++ b/mobile/src/main/jni/Android.mk @@ -257,7 +257,7 @@ SHADOWSOCKS_SOURCES := local.c \ LOCAL_MODULE := ss-local LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES)) LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \ - -DUSE_CRYPTO_MBEDTLS -DANDROID -DHAVE_CONFIG_H \ + -DUSE_CRYPTO_MBEDTLS -DHAVE_CONFIG_H \ -DCONNECT_IN_PROGRESS=EINPROGRESS \ -I$(LOCAL_PATH)/include/shadowsocks-libev \ -I$(LOCAL_PATH)/include \ @@ -294,7 +294,7 @@ SHADOWSOCKS_SOURCES := tunnel.c \ LOCAL_MODULE := ss-tunnel LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES)) LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \ - -DUSE_CRYPTO_MBEDTLS -DANDROID -DHAVE_CONFIG_H -DSSTUNNEL_JNI \ + -DUSE_CRYPTO_MBEDTLS -DHAVE_CONFIG_H -DSSTUNNEL_JNI \ -DCONNECT_IN_PROGRESS=EINPROGRESS \ -I$(LOCAL_PATH)/libancillary \ -I$(LOCAL_PATH)/include \ diff --git a/mobile/src/main/jni/badvpn b/mobile/src/main/jni/badvpn index af4a5647..e5abe704 160000 --- a/mobile/src/main/jni/badvpn +++ b/mobile/src/main/jni/badvpn @@ -1 +1 @@ -Subproject commit af4a5647eaa7263087d79817b38fc084e2206311 +Subproject commit e5abe7048d5a1dea589e8e26b33e17dd9533c078 diff --git a/mobile/src/main/jni/libev b/mobile/src/main/jni/libev index 981fb847..52134190 160000 --- a/mobile/src/main/jni/libev +++ b/mobile/src/main/jni/libev @@ -1 +1 @@ -Subproject commit 981fb847e1e306bc40460de4a810f63f9bbc7212 +Subproject commit 5213419011ec5de302f8bc1716f348de1fb53b12 diff --git a/mobile/src/main/jni/libevent b/mobile/src/main/jni/libevent index 5d5914f0..359ca847 160000 --- a/mobile/src/main/jni/libevent +++ b/mobile/src/main/jni/libevent @@ -1 +1 @@ -Subproject commit 5d5914f00b8adefd383f66b8b352855ece22a1d7 +Subproject commit 359ca847a649b9c318f9217c0755484d98ecb779 diff --git a/mobile/src/main/jni/redsocks b/mobile/src/main/jni/redsocks index 3bc3f03c..274334f1 160000 --- a/mobile/src/main/jni/redsocks +++ b/mobile/src/main/jni/redsocks @@ -1 +1 @@ -Subproject commit 3bc3f03c182b4c4ea5138eb7bebcaafe7cc0f53b +Subproject commit 274334f14839431ae003774d99c3d1de337afff4 diff --git a/mobile/src/main/jni/shadowsocks-libev b/mobile/src/main/jni/shadowsocks-libev index 33fe5adc..72622a3e 160000 --- a/mobile/src/main/jni/shadowsocks-libev +++ b/mobile/src/main/jni/shadowsocks-libev @@ -1 +1 @@ -Subproject commit 33fe5adc1957aafbc9bbaaa9e4dd85a90c52be3b +Subproject commit 72622a3e3df0d8b66f005717ecc48264275f453c