From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 19:20:15 +0200 Subject: ics-openvpn as a submodule! beautiful ics-openvpn is now officially on GitHub, and they track openssl and openvpn as submodules, so it's easier to update everything. Just a git submodule update --recursive. I've also set up soft links to native modules from ics-openvpn in app, so that we don't copy files in Gradle (which was causing problems with the submodules .git* files, not being copied). That makes the repo cleaner. --- app/snappy/Android.mk | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 app/snappy/Android.mk (limited to 'app/snappy/Android.mk') diff --git a/app/snappy/Android.mk b/app/snappy/Android.mk deleted file mode 100644 index cdd26003..00000000 --- a/app/snappy/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ - -LOCAL_PATH:= $(call my-dir) - - -common_SRC_FILES:= \ - snappy-c.cc \ - snappy-sinksource.cc \ - snappy-stubs-internal.cc \ - snappy.cc - -common_C_INCLUDES += $(LOCAL_PATH)/ $(LOCAL_PATH)/conf - -# static library -# ===================================================== - -include $(CLEAR_VARS) -LOCAL_CPP_EXTENSION := .cc -LOCAL_SRC_FILES:= $(common_SRC_FILES) -LOCAL_C_INCLUDES:= $(common_C_INCLUDES) -LOCAL_MODULE := snappy-static -LOCAL_PRELINK_MODULE:= false -LOCAL_MODULE_TAGS := optional -include $(BUILD_STATIC_LIBRARY) - -# dynamic library -# ===================================================== - -# include $(CLEAR_VARS) -# LOCAL_SRC_FILES:= $(common_SRC_FILES) -# LOCAL_C_INCLUDES:= $(common_C_INCLUDES) -# LOCAL_MODULE := liblzo -# LOCAL_PRELINK_MODULE:= false -# LOCAL_MODULE_TAGS := optional -# include $(BUILD_SHARED_LIBRARY) - -- cgit v1.2.3