From e6d6e3c97ff1bc5fb58ab2fb6b37c3054f492a98 Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <pcc@google.com>
Date: Tue, 26 Nov 2019 11:38:38 -0800
Subject: Drop dependency on GNU libunwind shared library.

We would like to use the name "libunwind" for something other than the
almost-unused GNU libunwind. This is the only user of the GNU libunwind
shared library in the tree, aside from GNU libunwind's own unit tests (which
I will fix separately). However, the code that uses GNU libunwind was put
behind an #ifndef ANDROID in commit 57eb94f1. The only remaining use was
the reference in the header #include. Put that behind the #ifndef as well,
so that we can remove the reference to libunwind.

Bug: 144430859
Change-Id: Ic5049762d9e3fa11beff946927baa771f7152ff5
---
 Android.bp     | 2 +-
 lib/igt_core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 4b03563a..7be68e64 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,7 +11,7 @@ cc_defaults {
         "-DHAVE_MEMFD_CREATE",
     ],
     static_libs: ["libelf", "libkmod"],
-    shared_libs: ["libdrm", "libunwind"],
+    shared_libs: ["libdrm"],
 }
 
 cc_library_static {
diff --git a/lib/igt_core.c b/lib/igt_core.c
index 20115f8f..42ada85d 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -72,8 +72,11 @@
 #include "igt_rc.h"
 #include "igt_list.h"
 
+#ifndef ANDROID
 #define UNW_LOCAL_ONLY
 #include <libunwind.h>
+#endif
+
 #include <elfutils/libdwfl.h>
 
 #ifdef HAVE_LIBGEN_H
-- 
cgit v1.2.3