diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-06-16 11:28:05 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-06-16 11:28:05 +0200 |
| commit | 66c79953db6876ec17a7ebf50dc4fd07d24fae37 (patch) | |
| tree | 67075abe6ea28f7fc7213f654b86464b13507058 /app/openssl/android-config.mk | |
| parent | 1f41fec6765e49838141ad29151713c7ac3dd17c (diff) | |
| parent | e533cf6939e3ea4233aa8a82812f8ce5fcb565ca (diff) | |
Merge branch 'develop'0.9.4
Diffstat (limited to 'app/openssl/android-config.mk')
| -rw-r--r-- | app/openssl/android-config.mk | 50 |
1 files changed, 0 insertions, 50 deletions
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 |