diff options
author | Brian Carlstrom <bdc@google.com> | 2012-03-15 16:03:43 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2012-03-21 11:09:32 -0700 |
commit | 392aa7cc7d2b122614c5393c3e357da07fd07af3 (patch) | |
tree | 69f0b217fb624fdc56abb9f659c9bdea1b1865aa /crypto/dso | |
parent | 7f1d63479ce92a2a4a0874b007e49f8acb13a0d9 (diff) | |
download | replicant_openssl-392aa7cc7d2b122614c5393c3e357da07fd07af3.zip replicant_openssl-392aa7cc7d2b122614c5393c3e357da07fd07af3.tar.gz replicant_openssl-392aa7cc7d2b122614c5393c3e357da07fd07af3.tar.bz2 |
openssl-1.0.1 upgrade
Bug: 6168278
Change-Id: I648f9172828120df5d19a14425e9ceec92647921
Diffstat (limited to 'crypto/dso')
-rw-r--r-- | crypto/dso/dso_dlfcn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index c2bc617..5f22548 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -86,7 +86,8 @@ DSO_METHOD *DSO_METHOD_dlfcn(void) # if defined(_AIX) || defined(__CYGWIN__) || \ defined(__SCO_VERSION__) || defined(_SCO_ELF) || \ (defined(__osf__) && !defined(RTLD_NEXT)) || \ - (defined(__OpenBSD__) && !defined(RTLD_SELF)) + (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \ + defined(__ANDROID__) # undef HAVE_DLINFO # endif #endif |