diff options
| author | zijunzhao <zijunzhao@google.com> | 2023-07-24 23:41:43 +0000 |
|---|---|---|
| committer | Zijun Zhao <zijunzhao@google.com> | 2023-07-25 18:27:23 +0000 |
| commit | 8500c74b3d9630292a57f49ec6e517f6851ecd52 (patch) | |
| tree | d985fec9d60dacef3c859de38e7e8205d1aa6785 | |
| parent | 49fc498c6fdef52c7fcc9693357b5190a70d0c26 (diff) | |
| download | igt-gpu-tools-8500c74b3d9630292a57f49ec6e517f6851ecd52.tar.gz | |
Fix duplicate symbols error in external/igt-gpu-tools
Symbol igt_subtest_jmpbuf is duplicate when switch -fcommon to -fno-common. Keep the old default for this project until we get a fixed version from upstream.@sadafebrahimi tried to update but lots of conflicts so we don't take the upstream fix.
Upstream fix patch:
https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/61ef576ea536d82776bd90af18cb6a590b22f520
Bug: b/151457797
Test: mm
Change-Id: I8e13e3706597d89d2fabc3932b00c724ee897f1e
| -rw-r--r-- | Android.bp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 9aa7f85a3..6f2ade7c3 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"], |