aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2017-01-26 08:15:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-26 08:15:38 +0000
commitffc2f7f3111a182e90926ed8d68efba4238fbfa4 (patch)
treed3eaf4fd86aee7df4dbaf9efd0e3b68a33d90c9a
parent73c4d3a97d1925001d0aef557fefb28d36c2ab15 (diff)
parentf3115138804a2202ecf79e7c3913619be56f4dfd (diff)
downloadtcpdump-ffc2f7f3111a182e90926ed8d68efba4238fbfa4.tar.gz
Merge "Revert "Disable -Waddress-of-packed-member temporarily."" am: e6c704418c am: ec64a7d9e3
am: f311513880 Change-Id: Ie265496cac24631de6aa3de2f11bb0a15199ea1c
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index becd082f..bd6d573e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -166,8 +166,6 @@ 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