From 38ba4e0588bc01dedbe8b14cf990a6f4ffe92fc7 Mon Sep 17 00:00:00 2001
From: mtklein <mtklein@chromium.org>
Date: Tue, 7 Oct 2014 09:54:18 -0700
Subject: Add -Wno-invalid-offsetof to Mac and iOS builds too.

We use this on Linux already, but for whatever reason wasn't a problem on iOS
until using it in SkPaint.  Mac 10.7 and 10.8 are showing this warning too,
but seems -Werror is not enabled.

CQ_EXTRA_TRYBOTS=tryserver.skia:Build-Mac10.7-Clang-Arm7-Release-iOS-Trybot

BUG=skia:

Review URL: https://codereview.chromium.org/637593002
---
 gyp/common_conditions.gypi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index ca5c98c4d4..4d06ffcc14 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -509,6 +509,7 @@
           'WARNING_CFLAGS': [
             '-Wall',
             '-Wextra',
+            '-Wno-invalid-offsetof',
             '-Wno-unused-parameter',
             '-Wno-uninitialized',  # Disabled because we think GCC 4.2 is bad at this.
           ],
@@ -551,6 +552,7 @@
           'SDKROOT': 'iphoneos',
           'TARGETED_DEVICE_FAMILY': '1,2',
           'OTHER_CPLUSPLUSFLAGS': [
+            '-Wno-invalid-offsetof',
             '-fvisibility=hidden',
             '-fvisibility-inlines-hidden',
           ],
-- 
cgit v1.2.3