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/openssl/Android.mk | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 app/openssl/Android.mk (limited to 'app/openssl/Android.mk') diff --git a/app/openssl/Android.mk b/app/openssl/Android.mk deleted file mode 100644 index 9753ac54..00000000 --- a/app/openssl/Android.mk +++ /dev/null @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -# Enable to be able to use ALOG* with #include "cutils/log.h" -#log_c_includes += system/core/include -#log_shared_libraries := liblog - -# These makefiles are here instead of being Android.mk files in the -# respective crypto, ssl, and apps directories so -# that import_openssl.sh import won't remove them. -include $(LOCAL_PATH)/build-config-64.mk -include $(LOCAL_PATH)/build-config-32.mk -include $(LOCAL_PATH)/Crypto.mk -include $(LOCAL_PATH)/Ssl.mk -#include $(LOCAL_PATH)/Apps.mk -- cgit v1.2.3