Use libunwind's version of unwind.h
libunwindbacktrace exports a version of unwind.h, but since we've
separated the object building from the linking in this makefile, we fall
back to the unwind.h that exists in our sysroot.
Define a dependency on libunwindbacktrace so that the include paths get
added during object compilation.
libunwind_llvm is used for arm, but it does not export any include
directories, so we'll fall back to the sysroot there.
Change-Id: If27508d480d474f8ce0dc7974a78fa04c9c674af
diff --git a/Android.mk b/Android.mk
index 3ed80df..6a7fbf0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -387,6 +387,14 @@
LOCAL_SANITIZE := never
LOCAL_CXX_STL := none
+# These don't actually link, but are required to get exported headers
+LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm
+LOCAL_STATIC_LIBRARIES_arm64 := libunwindbacktrace
+LOCAL_STATIC_LIBRARIES_mips := libunwindbacktrace
+LOCAL_STATIC_LIBRARIES_mips64 := libunwindbacktrace
+LOCAL_STATIC_LIBRARIES_x86 := libunwindbacktrace
+LOCAL_STATIC_LIBRARIES_x86_64 := libunwindbacktrace
+
include $(BUILD_STATIC_LIBRARY)
#=====================================================================
@@ -407,6 +415,10 @@
LOCAL_MULTILIB := both
LOCAL_CXX_STL := none
+# These don't actually link, but are required to get exported headers
+LOCAL_STATIC_LIBRARIES_linux := libunwindbacktrace
+LOCAL_STATIC_LIBRARIES_windows := libunwindbacktrace
+
include $(BUILD_HOST_STATIC_LIBRARY)
#=====================================================================
