Index: base/android/jni_android.cc |
diff --git a/base/android/jni_android.cc b/base/android/jni_android.cc |
index 56dc5c2ff3fe22c2e4628075beaf1097f60e2f91..c106445ebe157a13e3b35fc06668fb66e99ab990 100644 |
--- a/base/android/jni_android.cc |
+++ b/base/android/jni_android.cc |
@@ -11,7 +11,6 @@ |
#include "base/android/build_info.h" |
#include "base/android/jni_string.h" |
#include "base/android/jni_utils.h" |
-#include "base/debug/debugging_flags.h" |
#include "base/lazy_instance.h" |
#include "base/logging.h" |
#include "base/threading/thread_local.h" |
@@ -29,7 +28,7 @@ base::LazyInstance<base::android::ScopedJavaGlobalRef<jobject>>::Leaky |
g_class_loader = LAZY_INSTANCE_INITIALIZER; |
jmethodID g_class_loader_load_class_method_id = 0; |
-#if BUILDFLAG(ENABLE_PROFILING) && HAVE_TRACE_STACK_FRAME_POINTERS |
+#if HAVE_TRACE_STACK_FRAME_POINTERS() |
base::LazyInstance<base::ThreadLocalPointer<void>>::Leaky |
g_stack_frame_pointer = LAZY_INSTANCE_INITIALIZER; |
#endif |
@@ -289,7 +288,7 @@ std::string GetJavaExceptionInfo(JNIEnv* env, jthrowable java_throwable) { |
return ConvertJavaStringToUTF8(exception_string); |
} |
-#if BUILDFLAG(ENABLE_PROFILING) && HAVE_TRACE_STACK_FRAME_POINTERS |
+#if HAVE_TRACE_STACK_FRAME_POINTERS() |
JNIStackFrameSaver::JNIStackFrameSaver(void* current_fp) { |
previous_fp_ = g_stack_frame_pointer.Pointer()->Get(); |
@@ -304,7 +303,7 @@ void* JNIStackFrameSaver::SavedFrame() { |
return g_stack_frame_pointer.Pointer()->Get(); |
} |
-#endif // ENABLE_PROFILING && HAVE_TRACE_STACK_FRAME_POINTERS |
+#endif // HAVE_TRACE_STACK_FRAME_POINTERS() |
} // namespace android |
} // namespace base |