summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2017-01-26 08:13:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-26 08:13:15 +0000
commit7cd97025b369a8d924226391826728064d75cd6d (patch)
treebdabdb2e3af13bdf29b2a8488b8aafdcbc852b40
parent40480b6834ad6f85c1cdb69f03c550f60e5f8523 (diff)
parent64cff2891d8ea559c9bd1e1e29a280d4f68fdf82 (diff)
downloadplatform_external_android-clat-7cd97025b369a8d924226391826728064d75cd6d.tar.gz
platform_external_android-clat-7cd97025b369a8d924226391826728064d75cd6d.tar.bz2
platform_external_android-clat-7cd97025b369a8d924226391826728064d75cd6d.zip
Revert "Disable -Waddress-of-packed-member temporarily." am: 6f02370684
am: 64cff2891d Change-Id: I2f891738d9de0d8108b87dc5a2686bc65850b118
-rw-r--r--Android.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 8c0a43e..cdb7810 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:=clatd.c dump.c checksum.c translate.c icmp.c ipv4.c ipv6.c config.c dns64.c logging.c getaddr.c netlink_callbacks.c netlink_msg.c setif.c mtu.c tun.c ring.c
LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
-# Bug: http://b/33566695
-LOCAL_CFLAGS += -Wno-address-of-packed-member
LOCAL_C_INCLUDES := external/libnl/include bionic/libc/dns/include
LOCAL_STATIC_LIBRARIES := libnl
LOCAL_SHARED_LIBRARIES := libcutils liblog libnetutils
@@ -32,8 +30,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := clatd_test
LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
-# Bug: http://b/33566695
-LOCAL_CFLAGS += -Wno-address-of-packed-member
LOCAL_SRC_FILES := clatd_test.cpp checksum.c translate.c icmp.c ipv4.c ipv6.c logging.c config.c tun.c
LOCAL_MODULE_TAGS := eng tests
LOCAL_SHARED_LIBRARIES := liblog libnetutils