diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
| commit | 626c2706b1f7abdc6af1216873b7687e59025d1f (patch) | |
| tree | 0617ebb1e49364082071482aa9a977dd1da45940 /main/openssl/android-config.mk | |
| parent | 614b8790e5fc0bb3864eb2e3dd8c15016333d016 (diff) | |
Update OpenSSL to aosp/masterc0.6.13
--HG--
extra : rebase_source : a2f70c1a7529c7fcfc88f8dd1882e66e6ba42167
Diffstat (limited to 'main/openssl/android-config.mk')
| -rw-r--r-- | main/openssl/android-config.mk | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/main/openssl/android-config.mk b/main/openssl/android-config.mk index 84ab6782..2a091130 100644 --- a/main/openssl/android-config.mk +++ b/main/openssl/android-config.mk @@ -7,6 +7,20 @@ # 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))) @@ -27,11 +41,6 @@ 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 -# Directories -LOCAL_CFLAGS += \ - -DOPENSSLDIR="\"/system/lib/ssl\"" \ - -DENGINESDIR="\"/system/lib/ssl/engines\"" - # Debug # LOCAL_CFLAGS += -DCIPHER_DEBUG |