aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzijunzhao <zijunzhao@google.com>2023-07-26 20:38:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-07-26 20:38:58 +0000
commitdefb03323d27f65830a4af9a732c2ff708d151a0 (patch)
tree929d49305de8270ab0ad6dcaccf26cea3b0dd474
parentb7324d8d74fc629cdb08b8ae52f0521b1a943fbf (diff)
parentff248e647b5768e76b833f618320016b49bc9989 (diff)
downloadigt-gpu-tools-defb03323d27f65830a4af9a732c2ff708d151a0.tar.gz
Fix duplicate symbols error in external/igt-gpu-tools am: 8500c74b3d am: 9f9edec459 am: ff248e647b
Original change: https://android-review.googlesource.com/c/platform/external/igt-gpu-tools/+/2673977 Change-Id: I6259b7d4b13c59950fd433ea982d8d7854ceb928 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 26eef7c99..01f59dbed 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,6 +43,8 @@ cc_defaults {
"-DHAVE_GETTID",
"-DHAVE_LIBGEN_H",
"-DHAVE_MEMFD_CREATE",
+ "-fcommon", //ld.lld: error: duplicate symbol igt_subtest_jmpbuf: external/igt-gpu-tools/lib/igt_core.h:146
+ //Fixed upstream so we enable -fcommon locally
],
static_libs: ["libelf", "libkmod", "libion", "liblog"],
shared_libs: ["libdrm"],