aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2017-01-26 08:10:05 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-26 08:10:05 +0000
commitec64a7d9e33d5486881f41e8458d786a175f8f7d (patch)
treed3eaf4fd86aee7df4dbaf9efd0e3b68a33d90c9a
parent546e7c71f9e3c7cec8cc5d987af48fdd70a6a85f (diff)
parente6c704418c094bd36b38cd96a7d06ff7209a2dcb (diff)
downloadtcpdump-ec64a7d9e33d5486881f41e8458d786a175f8f7d.tar.gz
Merge "Revert "Disable -Waddress-of-packed-member temporarily.""
am: e6c704418c Change-Id: Iea9937fc8cab93ce68f29c9696c3f617f2ba515c
-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