From 8df38d9c9750477f318771e18d5a9257b4b61c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 17 Jun 2015 11:48:28 +0200
Subject: minivpn.c and dummy.cpp introduce randomness into nopievpn

---
 main/jni/Android.mk | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'main/jni/Android.mk')

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)
 
-- 
cgit v1.2.3