diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-06 14:27:07 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-06 14:27:07 +0100 |
| commit | 3493b8952e929d8ac22ea2a4928c0697c04fd7d0 (patch) | |
| tree | 304e8845bc2bc676dc991b2cd9ebca503527917a | |
| parent | 369ac22a4405bf2139c6e93439c2050411d92b10 (diff) | |
remove merge relics from Android.mk
| -rw-r--r-- | main/jni/Android.mk | 8 |
1 files changed, 0 insertions, 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) |