| OLD | NEW |
| 1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 Google Inc. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 # conditions used in both common.gypi and skia.gyp in chromium | 6 # conditions used in both common.gypi and skia.gyp in chromium |
| 7 # | 7 # |
| 8 { | 8 { |
| 9 'defines': [ | 9 'defines': [ |
| 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 ], | 243 ], |
| 244 }], | 244 }], |
| 245 [ 'skia_arch_type == "x86" and not skia_android_framework', { | 245 [ 'skia_arch_type == "x86" and not skia_android_framework', { |
| 246 'cflags': [ | 246 'cflags': [ |
| 247 '-m32', | 247 '-m32', |
| 248 ], | 248 ], |
| 249 'ldflags': [ | 249 'ldflags': [ |
| 250 '-m32', | 250 '-m32', |
| 251 ], | 251 ], |
| 252 }], | 252 }], |
| 253 [ 'skia_angle == 1' , { | |
| 254 'cflags!': [ | |
| 255 '-fstrict-aliasing', | |
| 256 ], | |
| 257 'cflags_cc!': [ | |
| 258 '-Wnon-virtual-dtor', | |
| 259 ], | |
| 260 'cflags_cc': [ | |
| 261 '-Wno-unknown-pragmas', | |
| 262 ], | |
| 263 }], | |
| 264 ], | 253 ], |
| 265 }], | 254 }], |
| 266 [ 'skia_warnings_as_errors', { | 255 [ 'skia_warnings_as_errors', { |
| 267 'cflags': [ | 256 'cflags': [ |
| 268 '-Werror', | 257 '-Werror', |
| 269 ], | 258 ], |
| 270 }], | 259 }], |
| 271 # For profiling; reveals some costs, exaggerates others (e.g. trivial
setters & getters). | 260 # For profiling; reveals some costs, exaggerates others (e.g. trivial
setters & getters). |
| 272 [ 'skia_disable_inlining', { | 261 [ 'skia_disable_inlining', { |
| 273 'cflags': [ | 262 'cflags': [ |
| (...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d | 617 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d |
| 629 ], | 618 ], |
| 630 }], | 619 }], |
| 631 | 620 |
| 632 ], # end 'conditions' | 621 ], # end 'conditions' |
| 633 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 622 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 634 'xcode_settings': { | 623 'xcode_settings': { |
| 635 'SYMROOT': '<(DEPTH)/xcodebuild', | 624 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 636 }, | 625 }, |
| 637 } | 626 } |
| OLD | NEW |