diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-07-25 05:36:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-25 05:36:53 +0000 |
| commit | 9d6b052141cbc860683bd2732991dd4650bd05ce (patch) | |
| tree | 08cd26db47b3ff933c7769f59b2d43f06e835214 | |
| parent | eddc051fe84b4d795a58d25e949cbd6a5b4b82f4 (diff) | |
| parent | f635494bf4c333e60abe535cf374e9e18ad0a6a0 (diff) | |
| download | iproute2-9d6b052141cbc860683bd2732991dd4650bd05ce.tar.gz | |
Merge "Fix duplicate symbols error in external/iproute2" into main am: 135e56a3ab am: 6b74b744d9 am: 57bc9af6c5 am: ced2110b77 am: f635494bf4
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2670015
Change-Id: I31b5b421933bc442422ba47f4b7919dfa198c2d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 ], } |