Update clang warnings after r287092.

Review URL: https://codereview.chromium.org/419973008

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@287125 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/libvpx.gyp b/libvpx.gyp
index 321af9b..5c2a0dd 100644
--- a/libvpx.gyp
+++ b/libvpx.gyp
@@ -99,6 +99,12 @@
                 ],
               }],
             ],
+            'clang_warning_flags': [
+              # libvpx heavily relies on implicit enum casting.
+              '-Wno-conversion',
+              # libvpx does `if ((a == b))` in some places.
+              '-Wno-parentheses-equality',
+            ],
           },
           'dependencies': [
             'gen_asm_offsets_vp8',
@@ -167,20 +173,6 @@
                 }],
               ],
             }],
-            ['clang == 1', {
-              'xcode_settings': {
-                'WARNING_CFLAGS': [
-                  # libvpx heavily relies on implicit enum casting.
-                  '-Wno-conversion',
-                  # libvpx does `if ((a == b))` in some places.
-                  '-Wno-parentheses-equality',
-                ],
-              },
-              'cflags': [
-                '-Wno-conversion',
-                '-Wno-parentheses-equality',
-              ],
-            }],
           ],
         },
       ],