skia: roll ANGLE and remove compile flags

Recent angle change allows us to remove some of the ANGLE specific
compile flags

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

diff --git a/DEPS b/DEPS
index dd48b7a468b4daa5656b3ed2024c087f140acf29..742d1de4440c51be0cf54fd13bc0520d9ef8e590 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -8,7 +8,7 @@ deps = {
   # There is some duplication here that might be worth cleaning up:
   #   - can use use our existing t_p/e/libjpeg instead of pulling it for Android?
 
-  "third_party/externals/angle2"  : "https://chromium.googlesource.com/angle/angle.git@4a693565dcfaba92f053db5c95e9338eac949245",
+  "third_party/externals/angle2"  : "https://chromium.googlesource.com/angle/angle.git@7258e30c8b4dd42b779f26f94eea91fc0ff3a118",
   "third_party/externals/cmake"   : "https://cmake.googlesource.com/cmake.git@v3.3.1",
   "third_party/externals/freetype": "https://skia.googlesource.com/third_party/freetype2.git@VER-2-5-0-1",
   "third_party/externals/gyp"     : "https://chromium.googlesource.com/external/gyp.git@08429da7955a98ef764fafa223dd7de73f654b2d",

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 60020ed23a619de4664302b174b93e0803f4db8f..54fa54345ec1d18468a5eef84dd0c20963b02864 100644 (file)
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -250,17 +250,6 @@
                   '-m32',
                 ],
               }],
-              [ 'skia_angle == 1' , {
-                'cflags!': [
-                  '-fstrict-aliasing',
-                ],
-                'cflags_cc!': [
-                  '-Wnon-virtual-dtor',
-                ],
-                'cflags_cc': [
-                  '-Wno-unknown-pragmas',
-                ],
-              }],
             ],
           }],
           [ 'skia_warnings_as_errors', {