diff --git a/common.gypi b/common.gypi
index 398d0fd19..77f63d50a 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1550,6 +1550,13 @@
             'xcode_settings': {
               'WARNING_CFLAGS!': ['-Wall', '-Wextra'],
             },
+            'conditions': [
+              ['buildtype=="Official"', {
+                'xcode_settings': {
+                  'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',    # -Werror
+                },
+              }],
+            ],
           }],
         ],
       }, {