diff options
author | Parménides GV <parmegv@sdf.org> | 2015-06-04 19:20:15 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-06-04 19:20:15 +0200 |
commit | 27594eeae6f40a402bc3110f06d57975168e74e3 (patch) | |
tree | cdabf6571e6f4ff07205fd6921d8095539a1fcdc /app/ovpn3/Android.mk | |
parent | 8dc4f58d96892fbfd83094fb85b1d17656035290 (diff) |
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.
Diffstat (limited to 'app/ovpn3/Android.mk')
-rw-r--r-- | app/ovpn3/Android.mk | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/app/ovpn3/Android.mk b/app/ovpn3/Android.mk deleted file mode 100644 index 7f037ac0..00000000 --- a/app/ovpn3/Android.mk +++ /dev/null @@ -1,40 +0,0 @@ -LOCAL_PATH:= $(call my-dir)/ - -include $(CLEAR_VARS) - -LOCAL_LDLIBS := -lz -LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/src/compat openvpn3/client openvpn3 boost_1_55_0 polarssl/include snappy -LOCAL_CPP_FEATURES += exceptions rtti - -#LOCAL_SHARED_LIBRARIES := libssl libcrypto -LOCAL_SHARED_LIBRARIES := polarssl-dynamic -#LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static liblzo-static -LOCAL_STATIC_LIBRARIES := liblzo-static snappy-static - -#LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\" -DUSE_OPENSSL -DOPENSSL_NO_ENGINE -LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\" -DUSE_POLARSSL -DHAVE_SNAPPY -DHAVE_LZO - -#ifneq ($(TARGET_ARCH),mips) -#LOCAL_STATIC_LIBRARIES += breakpad_client -#LOCAL_CFLAGS += -DGOOGLE_BREAKPAD=1 -#endif - -LOCAL_MODULE = ovpn3 - -LOCAL_SRC_FILES:= \ - ../openvpn3/javacli/ovpncli_wrap.cxx \ - boostsrc/error_code.cpp \ - ../openvpn3/client/ovpncli.cpp \ - - -#ifneq ($(TARGET_ARCH),mips) -#LOCAL_SRC_FILES+=src/openvpn/breakpad.cpp -#endif - - - -include $(BUILD_SHARED_LIBRARY) -#include $(BUILD_EXECUTABLE) - - - |