aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-01-03 14:29:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-03 14:29:41 -0800
commitfb95963728278dd174f7e2104f267bced6c74d82 (patch)
tree1bf5ff42d21ea46a50f0b87b90d28a02a1de9595
parent9a875aab3e3e5f174fd15743c805a5f32f216dcc (diff)
parent989ad86a78906e192add5955590d69d24a39fcf3 (diff)
downloadandroid_external_iproute2-fb95963728278dd174f7e2104f267bced6c74d82.tar.gz
android_external_iproute2-fb95963728278dd174f7e2104f267bced6c74d82.tar.bz2
android_external_iproute2-fb95963728278dd174f7e2104f267bced6c74d82.zip
am 989ad86a: Merge "Use bionic\'s setns(2)."
* commit '989ad86a78906e192add5955590d69d24a39fcf3': Use bionic's setns(2).
-rw-r--r--ip/Android.mk16
1 files changed, 10 insertions, 6 deletions
diff --git a/ip/Android.mk b/ip/Android.mk
index c55618c..ba0eb38 100644
--- a/ip/Android.mk
+++ b/ip/Android.mk
@@ -18,12 +18,16 @@ LOCAL_SHARED_LIBRARIES += libiprouteutil libnetlink
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
-LOCAL_CFLAGS := -O2 -g -W -Wall
-LOCAL_CFLAGS += -Wno-implicit-function-declaration
-LOCAL_CFLAGS += -Wno-missing-field-initializers
-LOCAL_CFLAGS += -Wno-pointer-arith
-LOCAL_CFLAGS += -Wno-sign-compare
-LOCAL_CFLAGS += -Werror
+LOCAL_CFLAGS := \
+ -O2 -g \
+ -W -Wall \
+ -Wno-implicit-function-declaration \
+ -Wno-missing-field-initializers \
+ -Wno-pointer-arith \
+ -Wno-sign-compare \
+ -Werror \
+ -D_GNU_SOURCE \
+ -DHAVE_SETNS \
LOCAL_LDFLAGS := -Wl,-export-dynamic -Wl,--no-gc-sections