diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-25 13:19:21 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-25 13:19:21 +0100 |
| commit | 576b0c26baf9b5b1418650a572604325ca7fb3af (patch) | |
| tree | 8b2986d66ed4e6bdf5a3253c81f32cc5a8e53b99 /ics-openvpn-stripped/main/openssl/android-config.mk | |
| parent | bbf877a099112acbf34589b01503c3f5ee135dc0 (diff) | |
| parent | 48cd0f2fa3094b5a6b7b07d6413d77bdbc9bbc20 (diff) | |
Merge branch 'develop'0.8.0
Diffstat (limited to 'ics-openvpn-stripped/main/openssl/android-config.mk')
| -rw-r--r-- | ics-openvpn-stripped/main/openssl/android-config.mk | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/ics-openvpn-stripped/main/openssl/android-config.mk b/ics-openvpn-stripped/main/openssl/android-config.mk new file mode 100644 index 00000000..2a091130 --- /dev/null +++ b/ics-openvpn-stripped/main/openssl/android-config.mk @@ -0,0 +1,48 @@ +# +# 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 + +# Debug +# LOCAL_CFLAGS += -DCIPHER_DEBUG + +# Add clang here when it works on host +# LOCAL_CLANG := true |