summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2018-10-16 17:34:44 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-16 17:34:44 -0700
commit07c03a33aa482b7cf8cd17d30f7e472140cdfd94 (patch)
tree42f1c5f412a151ca88f5ec38b11ad0291243c136
parent7c548aa70b2481f2a7f26b4e412c2e487b77398e (diff)
parentd48d285664e672f9dfa41c3637b3fb36455c1541 (diff)
downloadwifilogd-07c03a33aa482b7cf8cd17d30f7e472140cdfd94.tar.gz
Merge "Re-enable -Wover-aligned." am: e9999167ac
am: d48d285664 Change-Id: I4236d5e443a7a08dbd69624fb8b7c045cb4d98f1
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 7ac0d9f..60bd504 100644
--- a/Android.mk
+++ b/Android.mk
@@ -52,8 +52,6 @@ LOCAL_MODULE := wifilogd_unit_test
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_CPPFLAGS := $(wifilogd_cpp_flags) $(wifilogd_gtest_cpp_flags)
-# To workaround bug 112002407
-LOCAL_CPPFLAGS_x86 := -Wno-over-aligned
LOCAL_C_INCLUDES := $(wifilogd_includes)
LOCAL_SRC_FILES := \
tests/byte_buffer_unittest.cpp \