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