From 3493b8952e929d8ac22ea2a4928c0697c04fd7d0 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 6 Feb 2018 14:27:07 +0100 Subject: remove merge relics from Android.mk --- main/jni/Android.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/main/jni/Android.mk b/main/jni/Android.mk index 32a76dc0..e33ed1c7 100644 --- a/main/jni/Android.mk +++ b/main/jni/Android.mk @@ -73,10 +73,6 @@ 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) @@ -87,9 +83,5 @@ 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