aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Collingbourne <pcc@google.com>2019-11-26 14:24:41 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-26 14:24:41 -0800
commite083f5b647213c14ab0396684e8da3cce13ea9d1 (patch)
tree48357363f22c518213ba1eb04b867a90fb6606c4
parentb1777d7d58c818dc65c27322756939c3d20a1630 (diff)
parent333cbae32d91cac63a58cc9322c6337cacbfc390 (diff)
downloadplatform_external_igt-gpu-tools-e083f5b647213c14ab0396684e8da3cce13ea9d1.tar.gz
platform_external_igt-gpu-tools-e083f5b647213c14ab0396684e8da3cce13ea9d1.tar.bz2
platform_external_igt-gpu-tools-e083f5b647213c14ab0396684e8da3cce13ea9d1.zip
Drop dependency on GNU libunwind shared library. am: e6d6e3c97f am: 91537655de
am: 333cbae32d Change-Id: If10cda17c84e1081b966555235be36ddfa8575ad
-rw-r--r--Android.bp2
-rw-r--r--lib/igt_core.c3
2 files changed, 4 insertions, 1 deletions
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