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.

1 files changed, 0 insertions, 83 deletions

diff --git a/app/openssl/Ssl.mk b/app/openssl/Ssl.mk
deleted file mode 100644
index f3263ff0..00000000
--- a/app/openssl/Ssl.mk
+++ /dev/null
@@ -1,83 +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_SRC_FILES += $(target_src_files)
-LOCAL_CFLAGS += $(target_c_flags)
-LOCAL_C_INCLUDES += $(target_c_includes)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libssl_static
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
-include $(LOCAL_PATH)/Ssl-config-target.mk
-include $(LOCAL_PATH)/android-config.mk
-include $(LOCAL_PATH)/ndk-build.mk
-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
-else
-LOCAL_SDK_VERSION := 9
-endif
-
-LOCAL_SHARED_LIBRARIES += libcrypto
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libssl
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
-include $(LOCAL_PATH)/Ssl-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_SHARED_LIBRARIES += libcrypto-host
-# LOCAL_MODULE_TAGS := optional
-# LOCAL_MODULE := libssl-host
-# LOCAL_MULTILIB := both
-# LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
-# include $(LOCAL_PATH)/Ssl-config-host.mk
-# include $(LOCAL_PATH)/android-config.mk
-# include $(BUILD_HOST_SHARED_LIBRARY)
-
-# #######################################
-# # ssltest
-# include $(CLEAR_VARS)
-# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
-# LOCAL_C_INCLUDES := $(log_c_includes)
-
-# LOCAL_SRC_FILES := ssl/ssltest.c
-# LOCAL_SHARED_LIBRARIES := libssl libcrypto
-# LOCAL_MODULE := ssltest
-# LOCAL_MULTILIB := both
-# LOCAL_MODULE_STEM_32 := ssltest
-# LOCAL_MODULE_STEM_64 := ssltest64
-# LOCAL_MODULE_TAGS := optional
-# LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk
-# include $(LOCAL_PATH)/Ssl-config-host.mk
-# include $(LOCAL_PATH)/android-config.mk
-# include $(BUILD_EXECUTABLE)