commit 6c3fb8cd957a1b10858eac1120f27157e782c242
author Josh Gao <jmgao@google.com> Fri Sep 15 23:25:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 15 23:25:06 2017 +0000
tree 765f44be7d79d76f3df92b23e9318662630559ea
parent b10c98e34864d3d73d18c900025e718a90afb500
parent 0aeef7f988a3f43f905bb090dc1dd635778169a4

Merge "libbacktrace: make Backtrace::FormatFrameData static." am: 48b68b4944 am: 487f889016 am: afd41a985b
am: 2a16c70cfc

Change-Id: I9bedf4e27a75b31dbf72a7e22250436115fa6782

libbacktrace/include/backtrace/Backtrace.h

diff --git a/libbacktrace/include/backtrace/Backtrace.h b/libbacktrace/include/backtrace/Backtrace.h
index d67ea50..289fd0c 100644
--- a/libbacktrace/include/backtrace/Backtrace.h
+++ b/libbacktrace/include/backtrace/Backtrace.h
@@ -127,7 +127,7 @@
   // Create a string representing the formatted line of backtrace information
   // for a single frame.
   virtual std::string FormatFrameData(size_t frame_num);
-  virtual std::string FormatFrameData(const backtrace_frame_data_t* frame);
+  static std::string FormatFrameData(const backtrace_frame_data_t* frame);
 
   pid_t Pid() const { return pid_; }
   pid_t Tid() const { return tid_; }