diff options
Diffstat (limited to 'main/jni')
| -rw-r--r-- | main/jni/Android.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk index ae45c10d..32a76dc0 100644 --- a/main/jni/Android.mk +++ b/main/jni/Android.mk @@ -26,7 +26,7 @@ endif ifeq ($(WITH_BREAKPAD),1) - include breakpad/android/google_breakpad/Android.mk + include breakpad/android/google_breakpad/Android.mk endif ifeq ($(WITH_MBEDTLS),1) @@ -60,7 +60,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_LDLIBS := -llog -lz -LOCAL_CFLAGS = +LOCAL_CFLAGS = LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl openssl/crypto/include LOCAL_SRC_FILES:= jbcrypto.cpp LOCAL_MODULE = jbcrypto @@ -73,16 +73,23 @@ LOCAL_LDLIBS := -lz -lc LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static openvpn LOCAL_SRC_FILES:= minivpn.c dummy.cpp LOCAL_MODULE = nopie_openvpn +# ======= +# LOCAL_SRC_FILES:= # minivpn.c dummy.cpp +# LOCAL_MODULE = nopievpn +# >>>>>>> minivpn.c and dummy.cpp introduce randomness into nopievpn include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_LDLIBS := -lz -lc LOCAL_CFLAGS= -fPIE -pie -LOCAL_CFLAGS = -fPIE LOCAL_LDFLAGS = -fPIE -pie LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static openvpn LOCAL_SRC_FILES:= minivpn.c dummy.cpp LOCAL_MODULE = pie_openvpn +# ======= +# LOCAL_SRC_FILES:= # minivpn.c dummy.cpp +# LOCAL_MODULE = pievpn +# >>>>>>> minivpn.c and dummy.cpp introduce randomness into nopievpn include $(BUILD_EXECUTABLE) |