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/Crypto.mk | 81 --------------------------------------------------- 1 file changed, 81 deletions(-) delete mode 100644 app/openssl/Crypto.mk (limited to 'app/openssl/Crypto.mk') diff --git a/app/openssl/Crypto.mk b/app/openssl/Crypto.mk deleted file mode 100644 index 621627bf..00000000 --- a/app/openssl/Crypto.mk +++ /dev/null @@ -1,81 +0,0 @@ -####################################### -# target static library -include $(CLEAR_VARS) -include $(LOCAL_PATH)/ndk-build-clear.mk -LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -LOCAL_C_INCLUDES := $(log_c_includes) - -# The static library should be used in only unbundled apps -# and we don't have clang in unbundled build yet. -LOCAL_SDK_VERSION := 9 - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libcrypto_static -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk -include $(LOCAL_PATH)/Crypto-config-target.mk -include $(LOCAL_PATH)/android-config.mk -include $(LOCAL_PATH)/ndk-build.mk - -# Replace cflags with static-specific cflags so we dont build in libdl deps -LOCAL_CFLAGS_32 := $(openssl_cflags_static_32) -LOCAL_CFLAGS_64 := $(openssl_cflags_static_64) -include $(BUILD_STATIC_LIBRARY) - -####################################### -# target shared library -include $(CLEAR_VARS) -include $(LOCAL_PATH)/ndk-build-clear.mk -LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -LOCAL_C_INCLUDES := $(log_c_includes) - -# If we're building an unbundled build, don't try to use clang since it's not -# in the NDK yet. This can be removed when a clang version that is fast enough -# in the NDK. -ifeq (,$(TARGET_BUILD_APPS)) -LOCAL_CLANG := true -ifeq ($(HOST_OS), darwin_does_not_wrok) -LOCAL_ASFLAGS += -no-integrated-as -LOCAL_CFLAGS += -no-integrated-as -endif -else -LOCAL_SDK_VERSION := 9 -endif -LOCAL_LDFLAGS += -ldl - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libcrypto -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk -include $(LOCAL_PATH)/Crypto-config-target.mk -include $(LOCAL_PATH)/android-config.mk -include $(LOCAL_PATH)/ndk-build.mk -include $(BUILD_SHARED_LIBRARY) - -####################################### -# host shared library -# include $(CLEAR_VARS) -# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -# LOCAL_C_INCLUDES := $(log_c_includes) -# LOCAL_CFLAGS += -DPURIFY -# LOCAL_LDLIBS += -ldl -# LOCAL_MODULE_TAGS := optional -# LOCAL_MODULE := libcrypto-host -# LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk -# LOCAL_MULTILIB := both -# include $(LOCAL_PATH)/Crypto-config-host.mk -# include $(LOCAL_PATH)/android-config.mk -# include $(BUILD_HOST_SHARED_LIBRARY) - -######################################## -# host static library, which is used by some SDK tools. - -# include $(CLEAR_VARS) -# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -# LOCAL_C_INCLUDES := $(log_c_includes) -# LOCAL_CFLAGS += -DPURIFY -# LOCAL_LDLIBS += -ldl -# LOCAL_MODULE_TAGS := optional -# LOCAL_MODULE := libcrypto_static -# LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk -# include $(LOCAL_PATH)/Crypto-config-host.mk -# include $(LOCAL_PATH)/android-config.mk -# include $(BUILD_HOST_STATIC_LIBRARY) -- cgit v1.2.3