enable position independent executables(L is checked it)

KagayamaKaede · Oct 9, 2015 · d29542f · d29542f
1 parent 13199fd
commit d29542f
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 15 deletions.
diff --git a/app/src/main/assets/arm64-v8a/redsocks b/app/src/main/assets/arm64-v8a/redsocks
diff --git a/app/src/main/assets/arm64-v8a/ss-local b/app/src/main/assets/arm64-v8a/ss-local
diff --git a/app/src/main/assets/arm64-v8a/ss-tunnel b/app/src/main/assets/arm64-v8a/ss-tunnel
diff --git a/app/src/main/assets/armeabi-v7a/pdnsd b/app/src/main/assets/armeabi-v7a/pdnsd
diff --git a/app/src/main/assets/armeabi-v7a/redsocks b/app/src/main/assets/armeabi-v7a/redsocks
diff --git a/app/src/main/assets/armeabi-v7a/ss-local b/app/src/main/assets/armeabi-v7a/ss-local
diff --git a/app/src/main/assets/armeabi-v7a/ss-tunnel b/app/src/main/assets/armeabi-v7a/ss-tunnel
diff --git a/app/src/main/assets/armeabi-v7a/tun2socks b/app/src/main/assets/armeabi-v7a/tun2socks
diff --git a/app/src/main/java/com/proxy/shadowsocksr/SSRVPNService.java b/app/src/main/java/com/proxy/shadowsocksr/SSRVPNService.java
@@ -79,7 +79,6 @@ class SSRService extends ISSRService.Stub
                 {
                 }
                 onRevoke();
-                stopRunner();
                 return true;
             }
             return super.onTransact(code, data, reply, flags);

diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
@@ -61,7 +61,7 @@ SODIUM_SOURCE := $(crypto_aead_src) $(crypto_auth_src) $(crypto_box_src) \
 	$(crypto_stream_src) $(crypto_verify_src) $(randombytes_src) $(sodium_src)
 
 LOCAL_MODULE := sodium
-LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \
+LOCAL_CFLAGS += -pie -fPIE -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \
 				-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \
 				-DPACKAGE_NAME=\"libsodium\" -DPACKAGE_TARNAME=\"libsodium\" \
 				-DPACKAGE_VERSION=\"1.0.1\" -DPACKAGE_STRING=\"libsodium\ 1.0.1\" \
@@ -79,6 +79,8 @@ LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/in
 				-DHAVE_WEAK_SYMBOLS=1 -DHAVE_ARC4RANDOM=1 -DHAVE_ARC4RANDOM_BUF=1 \
 				-DHAVE_MLOCK=1 -DHAVE_MPROTECT=1 -DHAVE_POSIX_MEMALIGN=1
 
+LOCAL_LDFLAGS += -pie -fPIE
+
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libsodium/src/libsodium/,$(SODIUM_SOURCE))
 
 include $(BUILD_STATIC_LIBRARY)
@@ -104,10 +106,12 @@ LIBEVENT_SOURCES := \
 
 LOCAL_MODULE := event
 LOCAL_SRC_FILES := $(addprefix libevent/, $(LIBEVENT_SOURCES))
-LOCAL_CFLAGS := -O2 -I$(LOCAL_PATH)/libevent \
+LOCAL_CFLAGS := -pie -fPIE -O2 -I$(LOCAL_PATH)/libevent \
 	-I$(LOCAL_PATH)/libevent/include \
 	-I$(LOCAL_PATH)/openssl/include
 
+LOCAL_LDFLAGS += -pie -fPIE
+
 include $(BUILD_STATIC_LIBRARY)
 
 ########################################################
@@ -119,7 +123,9 @@ include $(CLEAR_VARS)
 ANCILLARY_SOURCE := fd_recv.c fd_send.c
 
 LOCAL_MODULE := libancillary
-LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/libancillary
+LOCAL_CFLAGS += -pie -fPIE -O2 -I$(LOCAL_PATH)/libancillary
+
+LOCAL_LDFLAGS += -pie -fPIE
 
 LOCAL_SRC_FILES := $(addprefix libancillary/, $(ANCILLARY_SOURCE))
 
@@ -141,9 +147,11 @@ set_src = set/allocation.c set/inspection.c set/ipv4_set.c set/ipv6_set.c \
 IPSET_SOURCE := general.c $(bdd_src) $(map_src) $(set_src)
 
 LOCAL_MODULE := libipset
-LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libipset/include \
+LOCAL_CFLAGS += -pie -fPIE -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libipset/include \
 				-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include
 
+LOCAL_LDFLAGS += -pie -fPIE
+
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libipset/,$(IPSET_SOURCE))
 
 include $(BUILD_STATIC_LIBRARY)
@@ -168,9 +176,11 @@ pthreads_src := pthreads/thread.c
 CORK_SOURCE := $(cli_src) $(core_src) $(ds_src) $(posix_src) $(pthreads_src)
 
 LOCAL_MODULE := libcork
-LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
+LOCAL_CFLAGS += -pie -fPIE -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
 				-DCORK_API=CORK_LOCAL
 
+LOCAL_LDFLAGS += -pie -fPIE
+
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libcork/,$(CORK_SOURCE))
 
 include $(BUILD_STATIC_LIBRARY)
@@ -187,9 +197,11 @@ UDNS_SOURCES := udns_dn.c udns_dntosp.c udns_parse.c udns_resolver.c udns_init.c
 	udns_rr_srv.c udns_rr_naptr.c udns_codes.c udns_jran.c
 
 LOCAL_MODULE := libudns
-LOCAL_CFLAGS += -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libudns \
+LOCAL_CFLAGS += -pie -fPIE -O2 -I$(LOCAL_PATH)/shadowsocks-libev/libudns \
 				-DHAVE_DECL_INET_NTOP
 
+LOCAL_LDFLAGS += -pie -fPIE
+
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/libudns/,$(UDNS_SOURCES))
 
 include $(BUILD_STATIC_LIBRARY)
@@ -201,10 +213,12 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libev
-LOCAL_CFLAGS += -O2 -DNDEBUG -DHAVE_CONFIG_H
+LOCAL_CFLAGS += -pie -fPIE -O2 -DNDEBUG -DHAVE_CONFIG_H
 LOCAL_SRC_FILES := \
 	libev/ev.c \
-	libev/event.c 
+	libev/event.c
+
+LOCAL_LDFLAGS += -pie -fPIE
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -223,10 +237,12 @@ LOCAL_STATIC_LIBRARIES := libevent
 
 LOCAL_MODULE := redsocks
 LOCAL_SRC_FILES := $(addprefix redsocks/, $(REDSOCKS_SOURCES)) 
-LOCAL_CFLAGS := -O2 -std=gnu99 -I$(LOCAL_PATH)/redsocks \
+LOCAL_CFLAGS := -pie -fPIE -O2 -std=gnu99 -I$(LOCAL_PATH)/redsocks \
 	-I$(LOCAL_PATH)/libevent/include \
 	-I$(LOCAL_PATH)/libevent
 
+LOCAL_LDFLAGS += -pie -fPIE
+
 include $(BUILD_EXECUTABLE)
 
 ########################################################
@@ -239,7 +255,9 @@ PDNSD_SOURCES  := $(wildcard $(LOCAL_PATH)/pdnsd/src/*.c)
 
 LOCAL_MODULE    := pdnsd
 LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%)
-LOCAL_CFLAGS    := -Wall -O2 -I$(LOCAL_PATH)/pdnsd
+LOCAL_CFLAGS    := -pie -fPIE -Wall -O2 -I$(LOCAL_PATH)/pdnsd
+
+LOCAL_LDFLAGS += -pie -fPIE
 
 include $(BUILD_EXECUTABLE)
 
@@ -253,7 +271,7 @@ SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c utils.c netutils.c j
 
 LOCAL_MODULE    := ss-local
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
-LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \
+LOCAL_CFLAGS    := -pie -fPIE -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \
 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
 					-I$(LOCAL_PATH)/libev \
 					-I$(LOCAL_PATH)/libancillary \
@@ -264,6 +282,8 @@ LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libipset/include
 
+LOCAL_LDFLAGS += -pie -fPIE
+
 LOCAL_STATIC_LIBRARIES := libev libcrypto libipset libcork libudns libsodium libancillary
 
 LOCAL_LDLIBS := -llog
@@ -280,15 +300,17 @@ SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c
 
 LOCAL_MODULE    := ss-tunnel
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
-LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \
+LOCAL_CFLAGS    := -pie -fPIE -Wall -O2 -fno-strict-aliasing -DUDPRELAY_LOCAL -DUDPRELAY_TUNNEL \
 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H -DSSTUNNEL_JNI \
 					-I$(LOCAL_PATH)/libev \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libudns \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libcork/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include \
 					-I$(LOCAL_PATH)/shadowsocks-libev/libsodium/src/libsodium/include/sodium \
-					-I$(LOCAL_PATH)/openssl/include 
+					-I$(LOCAL_PATH)/openssl/include
+
+LOCAL_LDFLAGS += -pie -fPIE
 
 LOCAL_STATIC_LIBRARIES := libev libcrypto libsodium libcork libudns libancillary
 
@@ -320,13 +342,15 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS := -std=gnu99
+LOCAL_CFLAGS := -std=gnu99 -pie -fPIE
 LOCAL_CFLAGS += -DBADVPN_THREADWORK_USE_PTHREAD -DBADVPN_LINUX -DBADVPN_BREACTOR_BADVPN -D_GNU_SOURCE
 LOCAL_CFLAGS += -DBADVPN_USE_SELFPIPE -DBADVPN_USE_EPOLL
 LOCAL_CFLAGS += -DBADVPN_LITTLE_ENDIAN -DBADVPN_THREAD_SAFE
 LOCAL_CFLAGS += -DNDEBUG -DANDROID
 # LOCAL_CFLAGS += -DTUN2SOCKS_JNI
 
+LOCAL_LDFLAGS += -pie -fPIE
+
 LOCAL_STATIC_LIBRARIES := libancillary
 
 LOCAL_C_INCLUDES:= \