diff options
| author |  hendrikw <hendrikw@chromium.org> | 2015-09-29 10:30:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-29 10:30:31 -0700 |
| commit | 03ba61436bbcc2f0081ddc975ed00e6a0c49e67c (patch) | |
| tree | f9b3a5dbea41cd2b50b494c3a96e4316bfd05946 | |
| parent | 966c2c33468fee81d49469a85d34cfcf964a7a30 (diff) | |
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
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 11 |
2 files changed, 1 insertions, 12 deletions
@@ -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 60020ed23a..54fa54345e 100644 --- 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', { |