aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2017-01-26 07:30:14 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-26 07:30:14 +0000
commit73c4d3a97d1925001d0aef557fefb28d36c2ab15 (patch)
tree923ff06976cfe16d826713eecc891d9d73b4063d
parent26572a336bd28373a0943081f042f25fa680b773 (diff)
parentee4ece57508ac6b65d76bf15ff2cb2e94f8158e8 (diff)
downloadtcpdump-73c4d3a97d1925001d0aef557fefb28d36c2ab15.tar.gz
Merge "Disable -Waddress-of-packed-member temporarily." am: a3c5862c50 am: 546e7c71f9
am: ee4ece5750 Change-Id: I37ede37ac3a06c501608b019e52acb1cbbe82fcd
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index bd6d573e..becd082f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -166,6 +166,8 @@ LOCAL_CFLAGS += -D_BSD_SOURCE
LOCAL_CFLAGS += -DHAVE_CONFIG_H
LOCAL_CFLAGS += -D_U_="__attribute__((unused))"
LOCAL_CFLAGS += -Werror
+# http://b/33566695
+LOCAL_CFLAGS += -Wno-address-of-packed-member
LOCAL_SHARED_LIBRARIES += libssl libcrypto libpcap
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := debug