summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2017-02-01 21:35:19 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-01 21:35:19 +0000
commit396ee5d5f60d6716caabcbbcd70df9f57ba5b841 (patch)
tree634b46c09f12fd2861f8a4006668611afb103397
parent374bf960824df8827b90b8fb0755e4f8a094e5c0 (diff)
parent9666b3f7282b8789045dc1ad103805c0cf517ef7 (diff)
downloadplatform_external_android-clat-396ee5d5f60d6716caabcbbcd70df9f57ba5b841.tar.gz
platform_external_android-clat-396ee5d5f60d6716caabcbbcd70df9f57ba5b841.tar.bz2
platform_external_android-clat-396ee5d5f60d6716caabcbbcd70df9f57ba5b841.zip
Revert "Revert "Disable -Waddress-of-packed-member temporarily."" am: 86aef02633 am: ca7e734504
am: 9666b3f728 Change-Id: I958535ba5951473c3ff286d7d95635a62c2b0b6d
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index cdb7810..8c0a43e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,6 +4,8 @@ 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
@@ -30,6 +32,8 @@ 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