commit 60aaf97844d4c21b8618fd50046e036c5f78ebe0
author Stephen Hines <srhines@google.com> Wed Feb 01 21:37:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 01 21:37:40 2017 +0000
tree 6aa6e4818bfbc3f0685aad672b21759ab956b971
parent 993a75afdf6c10e2666623edc6500da0a085715f
parent 8da857b73b2968908eab7329fa520a46d21566c0

Merge "Revert "Revert "Disable -Waddress-of-packed-member temporarily.""" am: 55efa30464 am: 275a8e7b36 am: 76e6ddb23a
am: 8da857b73b

Change-Id: I99502a8a05036e75109a5f766495a79680a9e40d

Android.mk

diff --git a/Android.mk b/Android.mk
index bd6d573..becd082 100644
--- a/Android.mk
+++ b/Android.mk
@@ -166,6 +166,8 @@
 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