summaryrefslogtreecommitdiff
path: root/main/jni
diff options
context:
space:
mode:
Diffstat (limited to 'main/jni')
-rw-r--r--main/jni/Android.mk12
1 files changed, 10 insertions, 2 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index 828bb8da..b16adb47 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)
@@ -58,7 +58,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
@@ -71,6 +71,10 @@ 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)
@@ -82,5 +86,9 @@ 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)