diff options
author | Josh Gao <jmgao@google.com> | 2016-04-28 02:17:35 +0000 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2016-05-12 00:59:16 +0000 |
commit | febb3d86bb846b4fc40cfa170728a8c42a9a7c7f (patch) | |
tree | 4cf2068cca20003818e3ba11d1b7d25745d9a0a7 | |
parent | e1c609bdd93dad9a2c454a732efb3046bbfdf38f (diff) | |
download | android_external_iproute2-febb3d86bb846b4fc40cfa170728a8c42a9a7c7f.tar.gz android_external_iproute2-febb3d86bb846b4fc40cfa170728a8c42a9a7c7f.tar.bz2 android_external_iproute2-febb3d86bb846b4fc40cfa170728a8c42a9a7c7f.zip |
Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4ccm-14.0
am: 465a65c
* commit '465a65c65df2b60a6010a56511378598917ce8b0':
ss: remove wtf.
Change-Id: Ib3ad0ca4e20765e5785850527adc4b702fcedaf4
(cherry picked from commit d60f0fa0525eb1b31605ef706585e850ae4c9f59)
BUG: 28704419
-rw-r--r-- | misc/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/Android.mk b/misc/Android.mk index 5104fdd..6867895 100644 --- a/misc/Android.mk +++ b/misc/Android.mk @@ -26,7 +26,7 @@ LOCAL_CFLAGS := \ -Wno-tautological-pointer-compare \ -Wno-unused-parameter \ -Werror \ - '-Dsethostent=cos' \ + '-Dsethostent(x)=' \ $(yacc_flags) \ -DHAVE_SETNS |