diff options
| author | zijunzhao <zijunzhao@google.com> | 2023-07-20 22:52:42 +0000 |
|---|---|---|
| committer | Zijun Zhao <zijunzhao@google.com> | 2023-07-24 22:48:35 +0000 |
| commit | 02786fa2a357688cdff5ea8d38d943099e76192a (patch) | |
| tree | 08cd26db47b3ff933c7769f59b2d43f06e835214 | |
| parent | 352df531fe23893d45ef00c6671f48dbadb815fb (diff) | |
| download | iproute2-02786fa2a357688cdff5ea8d38d943099e76192a.tar.gz | |
Fix duplicate symbols error in external/iproute2
Symbol filter and listen_all_nsid are duplicate when switch -fcommon to -fno-common. Keep the old default for this project until we get a fixed version from upstream.
Upstream fix patch:
https://github.com/shemminger/iproute2/commit/578cadcc68035943062d74507c3b7989741b353f
https://github.com/shemminger/iproute2/commit/fa92d8cb09e6a254d26834a66e4645ece6662f1a
Bug: b/151457797
Test: mm
Change-Id: I916bb676f179354918d63b40175eebfcb3714513
| -rw-r--r-- | Android.bp | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -87,5 +87,8 @@ cc_defaults { "-DNO_SHARED_LIBS", "-Dstrdupa(__S)=strcpy(alloca(strlen(__S) + 1), __S)", + "-fcommon", //ld.lld: error: duplicate symbol filter: external/iproute2/ip/ipmroute.c:53 and external/iproute2/ip/ipxfrm.c:44 + //ld.lld: error: duplicate symbol listen_all_nsid: external/iproute2/ip/ipmonitor.c:29 and external/iproute2/ip/xfrm_monitor.c:37 + //Fixed upstream so we enable -fcommon locally ], } |