diff options
| author | Peter Collingbourne <pcc@google.com> | 2019-11-26 11:38:38 -0800 |
|---|---|---|
| committer | Peter Collingbourne <pcc@google.com> | 2019-11-26 11:44:13 -0800 |
| commit | e6d6e3c97ff1bc5fb58ab2fb6b37c3054f492a98 (patch) | |
| tree | 48357363f22c518213ba1eb04b867a90fb6606c4 | |
| parent | da4d1507ff3bc6f3ec6d1314d7a39f1eb56e80c8 (diff) | |
| download | platform_external_igt-gpu-tools-e6d6e3c97ff1bc5fb58ab2fb6b37c3054f492a98.tar.gz platform_external_igt-gpu-tools-e6d6e3c97ff1bc5fb58ab2fb6b37c3054f492a98.tar.bz2 platform_external_igt-gpu-tools-e6d6e3c97ff1bc5fb58ab2fb6b37c3054f492a98.zip | |
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
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | lib/igt_core.c | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -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 |