summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Albert <danalbert@google.com> 2014-12-05 18:01:49 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-12-05 18:01:49 +0000
commitbcf7f22102db47e37a8398d71895fa233ff84d84 (patch)
tree0c51cb1fbbb18e3a5ab4d8a8823dd909f0595930
parentbb3715357781c6a0cecc0aaf36ff3d5394155180 (diff)
parent67df03d054f0cc4bd0e47066642b791198e9b0ad (diff)
am 67df03d0: Merge "Disable struct padding warning/error"
* commit '67df03d054f0cc4bd0e47066642b791198e9b0ad': Disable struct padding warning/error
-rw-r--r--libs/ui/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk
index 72430d2eba..1ce8626522 100644
--- a/libs/ui/Android.mk
+++ b/libs/ui/Android.mk
@@ -30,6 +30,9 @@ LOCAL_CPPFLAGS += -Wno-c++98-compat-pedantic
# that they're non-portable as long as they're consistent within one execution
LOCAL_CPPFLAGS += -Wno-four-char-constants
+# Don't warn about struct padding
+LOCAL_CPPFLAGS += -Wno-padded
+
LOCAL_SRC_FILES := \
Fence.cpp \
FramebufferNativeWindow.cpp \