Merge "Rename debug_stacktrace to debug_backtrace."

libc/Android.mk

@@ -1428,8 +1428,8 @@ LOCAL_C_INCLUDES := \
     $(libc_common_c_includes) \
 
 LOCAL_SRC_FILES := \
+    bionic/debug_backtrace.cpp \
     bionic/debug_mapinfo.cpp \
-    bionic/debug_stacktrace.cpp \
     bionic/libc_logging.cpp \
     bionic/malloc_debug_leak.cpp \
     bionic/malloc_debug_check.cpp \

libc/bionic/debug_backtrace.cpp

@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 
-#include "debug_stacktrace.h"
+#include "debug_backtrace.h"
 
 #include <dlfcn.h>
 #include <inttypes.h>

libc/bionic/debug_backtrace.h

@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef DEBUG_STACKTRACE_H
-#define DEBUG_STACKTRACE_H
+#ifndef DEBUG_BACKTRACE_H
+#define DEBUG_BACKTRACE_H
 
 #include <stdint.h>
 #include <sys/cdefs.h>
@@ -37,4 +37,4 @@ __LIBC_HIDDEN__ void backtrace_shutdown();
 __LIBC_HIDDEN__ int get_backtrace(uintptr_t* stack_frames, size_t max_depth);
 __LIBC_HIDDEN__ void log_backtrace(uintptr_t* stack_frames, size_t frame_count);
 
-#endif /* DEBUG_STACKTRACE_H */
+#endif /* DEBUG_BACKTRACE_H */

libc/bionic/malloc_debug_check.cpp

@@ -47,7 +47,7 @@
 #include <unwind.h>
 
 #include "debug_mapinfo.h"
-#include "debug_stacktrace.h"
+#include "debug_backtrace.h"
 #include "malloc_debug_backtrace.h"
 #include "malloc_debug_common.h"
 #include "malloc_debug_disable.h"

libc/bionic/malloc_debug_leak.cpp

@@ -46,7 +46,7 @@
 #include <unistd.h>
 #include <unwind.h>
 
-#include "debug_stacktrace.h"
+#include "debug_backtrace.h"
 #include "malloc_debug_backtrace.h"
 #include "malloc_debug_common.h"
 #include "malloc_debug_disable.h"