summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/jni/Android.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index c61db83e..8d2d0219 100644
--- a/main/jni/Android.mk
+++ b/main/jni/Android.mk
@@ -65,8 +65,13 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_LDLIBS := -lz -lc
LOCAL_SHARED_LIBRARIES := libssl libcrypto 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)
@@ -78,5 +83,9 @@ LOCAL_LDFLAGS = -fPIE -pie
LOCAL_SHARED_LIBRARIES := libssl libcrypto 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)