commit bb3e26b83560ab45e9251ee34e4e0008a44d89a9
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 18 19:36:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 18 19:36:40 2017 +0000
tree 57096bfb8e220a59e71cfb0643a2e706dbc18e20
parent ccdad6bbd37772ec69448f80692c064d52b8b569
parent c39fbd235729f206df13ff1fde2dc8c24dcaafa7

Merge "bootstat: Log the ro.boot.bootreason property through the new platform_reason Tron field."

debuggerd/crasher/Android.bp

diff --git a/debuggerd/crasher/Android.bp b/debuggerd/crasher/Android.bp
index b7b1938..67b4ab7 100644
--- a/debuggerd/crasher/Android.bp
+++ b/debuggerd/crasher/Android.bp
@@ -17,7 +17,7 @@
         arm: {
             srcs: ["arm/crashglue.S"],
 
-            armv7_a_neon: {
+            neon: {
                 asflags: ["-DHAS_VFP_D32"],
             },
         },

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