am db9697b3: am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."

# Via Android Git Automerger (1) and others
* commit 'db9697b3b059469153e81bf9e8844fb8e23149ea':
  libcorkscrew will always HAVE_DLADDR.

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 @@ void get_backtrace_symbols(const backtrace_frame_t* backtrace, size_t frames,
             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 @@ void get_backtrace_symbols(const backtrace_frame_t* backtrace, size_t frames,
                 symbol->symbol_name = strdup(info.dli_sname);
                 symbol->demangled_name = demangle_symbol_name(symbol->symbol_name);
             }
-#endif
         }
     }
     release_my_map_info_list(milist);