commit 993a75afdf6c10e2666623edc6500da0a085715f
author Brian Carlstrom <bdc@google.com> Thu Jan 26 08:18:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 08:18:40 2017 +0000
tree be1d3ab9a729437d0e11ae667a6bc6827a820170
parent 9e50ac12327301b2dda6b0db835fd7f26809ff3e
parent ffc2f7f3111a182e90926ed8d68efba4238fbfa4

Merge "Revert "Disable -Waddress-of-packed-member temporarily."" am: e6c704418c am: ec64a7d9e3 am: f311513880
am: ffc2f7f311

Change-Id: I9a2e4e002563f5e826d619c80d3d6fadd41f766c

Android.mk

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