| OLD | NEW | 
|    1 # conditions used in both common.gypi and skia.gyp in chromium |    1 # conditions used in both common.gypi and skia.gyp in chromium | 
|    2 # |    2 # | 
|    3 { |    3 { | 
|    4   'defines': [ |    4   'defines': [ | 
|    5     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |    5     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 
|    6     'SK_SUPPORT_GPU=<(skia_gpu)', |    6     'SK_SUPPORT_GPU=<(skia_gpu)', | 
|    7     'SK_SUPPORT_OPENCL=<(skia_opencl)', |    7     'SK_SUPPORT_OPENCL=<(skia_opencl)', | 
|    8     'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', |    8     'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', | 
|    9   ], |    9   ], | 
|   10   'conditions' : [ |   10   'conditions' : [ | 
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  428                   }], |  428                   }], | 
|  429                 ], |  429                 ], | 
|  430               }], |  430               }], | 
|  431             ], |  431             ], | 
|  432           }], |  432           }], | 
|  433           [ 'skia_clang_build', { |  433           [ 'skia_clang_build', { | 
|  434             'cflags': [ |  434             'cflags': [ | 
|  435               # Extra warnings we like but that only Clang knows about. |  435               # Extra warnings we like but that only Clang knows about. | 
|  436               '-Wstring-conversion', |  436               '-Wstring-conversion', | 
|  437             ], |  437             ], | 
 |  438             'cflags!': [ | 
 |  439                 '-mfpmath=sse',  # Clang doesn't need to be told this, and somet
     imes gets confused. | 
 |  440             ], | 
|  438           }], |  441           }], | 
|  439           [ 'skia_keep_frame_pointer', { |  442           [ 'skia_keep_frame_pointer', { | 
|  440             'cflags': [ '-fno-omit-frame-pointer' ], |  443             'cflags': [ '-fno-omit-frame-pointer' ], | 
|  441           }], |  444           }], | 
|  442         ], |  445         ], | 
|  443       }, |  446       }, | 
|  444     ], |  447     ], | 
|  445  |  448  | 
|  446     [ 'skia_os == "mac"', |  449     [ 'skia_os == "mac"', | 
|  447       { |  450       { | 
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  651         'SK_BUILD_JSON_WRITER', |  654         'SK_BUILD_JSON_WRITER', | 
|  652       ] |  655       ] | 
|  653     }], |  656     }], | 
|  654  |  657  | 
|  655   ], # end 'conditions' |  658   ], # end 'conditions' | 
|  656   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
      more details |  659   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
      more details | 
|  657   'xcode_settings': { |  660   'xcode_settings': { | 
|  658     'SYMROOT': '<(DEPTH)/xcodebuild', |  661     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  659   }, |  662   }, | 
|  660 } |  663 } | 
| OLD | NEW |