aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2023-03-04 07:11:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-04 07:11:00 +0000
commit1e746f77f095f87900fe767920c5992430c25e90 (patch)
tree8875fa0f27533cfd26a14eaec6d5e7ed94fd8f96
parent135f51fcf13fd8d25eba08d84589b50749899666 (diff)
parenta16dd6b4ec3a36f72e1b994ce719623f9db7ad65 (diff)
downloadiproute2-1e746f77f095f87900fe767920c5992430c25e90.tar.gz
Merge "Enable strdupa() for this project, build ip_bond*.c." am: b1b8b3b458 am: ddb412aa21 am: 7065904ca0 am: a16dd6b4ec
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2466013 Change-Id: I91e50cc560178813077d184bf3cf6e38998ff47a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp2
-rw-r--r--ip/Android.bp2
2 files changed, 4 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index b4c5cf5e..c9c79304 100644
--- a/Android.bp
+++ b/Android.bp
@@ -85,5 +85,7 @@ cc_defaults {
"-DHAVE_UTIME_H",
"-DNO_SHARED_LIBS",
+
+ "-Dstrdupa(__S)=strcpy(alloca(strlen(__S) + 1), __S)",
],
}
diff --git a/ip/Android.bp b/ip/Android.bp
index 25a44677..b40fc4a0 100644
--- a/ip/Android.bp
+++ b/ip/Android.bp
@@ -43,6 +43,8 @@ cc_binary {
"ipfou.c",
"ipila.c",
"ipl2tp.c",
+ "iplink_bond.c",
+ "iplink_bond_slave.c",
"iplink_bridge.c",
"iplink_bridge_slave.c",
"iplink.c",