Explicitly specify whether to emit frame pointers by default.

base/android/jni_android.h

Index: base/android/jni_android.h
diff --git a/base/android/jni_android.h b/base/android/jni_android.h
index de53c10f6d43e82099065427db083ff2547cf784..f532780eb07a9c7f9d1e4debb11d46d562ca4c51 100644
--- a/base/android/jni_android.h
+++ b/base/android/jni_android.h
@@ -17,7 +17,7 @@
 #include "base/debug/stack_trace.h"
 #include "base/macros.h"
 
-#if HAVE_TRACE_STACK_FRAME_POINTERS
+#if CAN_UNWIND_WITH_FRAME_POINTERS

[Mark Mentovai, 2017/03/30 23:43:29]

Are you still planning on removing this from headers?

[erikchen, 2017/04/03 06:33:39]

No. Issue 706654 is the tracking bug to either fix or remove this macro.

 
 // When profiling is enabled (enable_profiling=true) this macro is added to
 // all generated JNI stubs so that it becomes the last thing that runs before
@@ -46,7 +46,7 @@
 #define JNI_SAVE_FRAME_POINTER
 #define JNI_LINK_SAVED_FRAME_POINTER
 
-#endif  // HAVE_TRACE_STACK_FRAME_POINTERS
+#endif  // CAN_UNWIND_WITH_FRAME_POINTERS
 
 namespace base {
 namespace android {
@@ -166,7 +166,7 @@ BASE_EXPORT void CheckException(JNIEnv* env);
 BASE_EXPORT std::string GetJavaExceptionInfo(JNIEnv* env,
                                              jthrowable java_throwable);
 
-#if HAVE_TRACE_STACK_FRAME_POINTERS
+#if CAN_UNWIND_WITH_FRAME_POINTERS
 
 // Saves caller's PC and stack frame in a thread-local variable.
 // Implemented only when profiling is enabled (enable_profiling=true).
@@ -182,7 +182,7 @@ class BASE_EXPORT JNIStackFrameSaver {
   DISALLOW_COPY_AND_ASSIGN(JNIStackFrameSaver);
 };
 
-#endif  // HAVE_TRACE_STACK_FRAME_POINTERS
+#endif  // CAN_UNWIND_WITH_FRAME_POINTERS
 
 }  // namespace android
 }  // namespace base