commit 25ca7d3a2f4496dec0c9bf0489f71b3f15687c63
author Yabin Cui <yabinc@google.com> Wed Sep 23 05:15:52 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 23 05:15:52 2015 +0000
tree c9d1c06242db03daef65d4239c99438592280657
parent 7f19de05d4840af00a3667bc8fecd2c93dda52b8
parent 296ab576a73690792c0d2db8e99c23cb0dbf2e2f

am bbada6b9: Merge "libbacktrace: enable -fno-omit-frame-pointer for host build."

* commit 'bbada6b9423a802bbde3340904f21270adf88110':
  libbacktrace: enable -fno-omit-frame-pointer for host build.

libbacktrace/Android.build.mk

diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk
index 8e63dab..84d07f2 100644
--- a/libbacktrace/Android.build.mk
+++ b/libbacktrace/Android.build.mk
@@ -79,8 +79,13 @@
 ifeq ($(build_type),host)
   # Only build if host builds are supported.
   ifeq ($(build_host),true)
-    LOCAL_CFLAGS += -Wno-extern-c-compat -fno-omit-frame-pointer
     include $(LLVM_HOST_BUILD_MK)
+    # -fno-omit-frame-pointer should be set for host build. Because currently
+    # libunwind can't recognize .debug_frame using dwarf version 4, and it relies
+    # on stack frame pointer to do unwinding on x86.
+    # $(LLVM_HOST_BUILD_MK) overwrites -fno-omit-frame-pointer. so the below line
+    # must be after the include.
+    LOCAL_CFLAGS += -Wno-extern-c-compat -fno-omit-frame-pointer
     include $(BUILD_HOST_$(build_target))
   endif
 endif