commit 0aad154093daab5923b165996e7af19c0d1f84ed
author Dan Willemsen <dwillemsen@google.com> Tue Mar 08 05:57:38 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 08 05:57:38 2016 +0000
tree 04d1373ac2502926d7c417464a1686a18279f622
parent c6124f7579ddf07c26c37595049edab3da6a4dcd
parent b09bd8b703471410af7a8d32a7b251301b451ada

Merge "Use libunwind's version of unwind.h"

Android.mk

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)
 
 #=====================================================================