commit db9697b3b059469153e81bf9e8844fb8e23149ea
author Elliott Hughes <enh@google.com> Tue Jan 29 10:27:36 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 29 10:27:36 2013 -0800
tree b4e4b0c51fdcf8fb6f6fe50516cb50e40bb5a140
parent 35d5b7e62456fa921d40d1ea5d91e6fcbbe8744d
parent b94b038df58cb13ae2073a28d5264bf9162d5be5

am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'b94b038df58cb13ae2073a28d5264bf9162d5be5':
  libcorkscrew will always HAVE_DLADDR.

libcorkscrew/backtrace.c

diff --git a/libcorkscrew/backtrace.c b/libcorkscrew/backtrace.c
index 3697d18..03dbd53 100644
--- a/libcorkscrew/backtrace.c
+++ b/libcorkscrew/backtrace.c
@@ -35,10 +35,8 @@
 #include <cutils/atomic.h>
 #include <elf.h>
 
-#if HAVE_DLADDR
 #define __USE_GNU // For dladdr(3) in glibc.
 #include <dlfcn.h>
-#endif
 
 #if defined(__BIONIC__)
 
@@ -256,7 +254,6 @@
             if (mi->name[0]) {
                 symbol->map_name = strdup(mi->name);
             }
-#if HAVE_DLADDR
             Dl_info info;
             if (dladdr((const void*)frame->absolute_pc, &info) && info.dli_sname) {
                 symbol->relative_symbol_addr = (uintptr_t)info.dli_saddr
@@ -264,7 +261,6 @@
                 symbol->symbol_name = strdup(info.dli_sname);
                 symbol->demangled_name = demangle_symbol_name(symbol->symbol_name);
             }
-#endif
         }
     }
     release_my_map_info_list(milist);