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-config.mk | 50 ------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 app/openssl/android-config.mk (limited to 'app/openssl/android-config.mk') diff --git a/app/openssl/android-config.mk b/app/openssl/android-config.mk deleted file mode 100644 index 675a65b3..00000000 --- a/app/openssl/android-config.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# These flags represent the build-time configuration of OpenSSL for android -# -# The value of $(openssl_cflags) was pruned from the Makefile generated -# by running ./Configure from import_openssl.sh. -# -# This script performs minor but required patching for the Android build. -# - -# Directories for ENGINE shared libraries -openssl_cflags_32 += \ - -DOPENSSLDIR="\"/system/lib/ssl\"" \ - -DENGINESDIR="\"/system/lib/ssl/engines\"" -openssl_cflags_static_32 += \ - -DOPENSSLDIR="\"/system/lib/ssl\"" \ - -DENGINESDIR="\"/system/lib/ssl/engines\"" -openssl_cflags_64 += \ - -DOPENSSLDIR="\"/system/lib64/ssl\"" \ - -DENGINESDIR="\"/system/lib64/ssl/engines\"" -openssl_cflags_static_64 += \ - -DOPENSSLDIR="\"/system/lib64/ssl\"" \ - -DENGINESDIR="\"/system/lib64/ssl/engines\"" - -# Intentionally excluded http://b/7079965 -ifneq (,$(filter -DZLIB, $(openssl_cflags_32) $(openssl_cflags_64) \ - $(openssl_cflags_static_32) $(openssl_cflags_static_64))) -$(error ZLIB should not be enabled in openssl configuration) -endif - -LOCAL_CFLAGS_32 += $(openssl_cflags_32) -LOCAL_CFLAGS_64 += $(openssl_cflags_64) - -LOCAL_CFLAGS_32 := $(filter-out -DTERMIO, $(LOCAL_CFLAGS_32)) -LOCAL_CFLAGS_64 := $(filter-out -DTERMIO, $(LOCAL_CFLAGS_64)) -# filter out static flags too -openssl_cflags_static_32 := $(filter-out -DTERMIO, $(openssl_cflags_static_32)) -openssl_cflags_static_64 := $(filter-out -DTERMIO, $(openssl_cflags_static_64)) - -ifeq ($(HOST_OS),windows) -LOCAL_CFLAGS_32 := $(filter-out -DDSO_DLFCN -DHAVE_DLFCN_H,$(LOCAL_CFLAGS_32)) -LOCAL_CFLAGS_64 := $(filter-out -DDSO_DLFCN -DHAVE_DLFCN_H,$(LOCAL_CFLAGS_64)) -endif - -LOCAL_CFLAGS += -Wno-missing-field-initializers -Wno-unused-parameter - -# Debug -# LOCAL_CFLAGS += -DCIPHER_DEBUG - -# Add clang here when it works on host -# LOCAL_CLANG := true -- cgit v1.2.3