commit 0aeef7f988a3f43f905bb090dc1dd635778169a4
author Josh Gao <jmgao@google.com> Fri Sep 15 23:23:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 15 23:23:08 2017 +0000
tree 1fdeb26a47056d75363f8e011bc35d033637cee9
parent c39c6a2ec6719dd41a35b9c83f36ff5d68cd27d1
parent d31c9ec852284e0b154c6451fee1ff8f8d6dc18d

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

Change-Id: Id6c8a1a3a0d3cc70e138a6d14b7cf2d02b30ee5a

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_; }