| 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 '-Wall', | 168 '-Wall', |
| 169 '-Wextra', | 169 '-Wextra', |
| 170 '-Winit-self', | 170 '-Winit-self', |
| 171 '-Wpointer-arith', | 171 '-Wpointer-arith', |
| 172 | 172 |
| 173 '-Wno-unused-parameter', | 173 '-Wno-unused-parameter', |
| 174 ], | 174 ], |
| 175 'cflags_cc': [ | 175 'cflags_cc': [ |
| 176 '-fno-rtti', | 176 '-fno-rtti', |
| 177 '-Wnon-virtual-dtor', | 177 '-Wnon-virtual-dtor', |
| 178 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i
s POD. |
| 178 ], | 179 ], |
| 179 'conditions': [ | 180 'conditions': [ |
| 180 [ 'skia_android_framework==0', { | 181 [ 'skia_android_framework==0', { |
| 181 'cflags': [ | 182 'cflags': [ |
| 182 # This flag is not supported by Android build system. | 183 # This flag is not supported by Android build system. |
| 183 '-Wno-c++11-extensions', | 184 '-Wno-c++11-extensions', |
| 184 ], | 185 ], |
| 185 }], | 186 }], |
| 186 [ 'skia_warnings_as_errors', { | 187 [ 'skia_warnings_as_errors', { |
| 187 'cflags': [ | 188 'cflags': [ |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 683 'SK_BUILD_JSON_WRITER', | 684 'SK_BUILD_JSON_WRITER', |
| 684 ] | 685 ] |
| 685 }], | 686 }], |
| 686 | 687 |
| 687 ], # end 'conditions' | 688 ], # end 'conditions' |
| 688 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 689 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 689 'xcode_settings': { | 690 'xcode_settings': { |
| 690 'SYMROOT': '<(DEPTH)/xcodebuild', | 691 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 691 }, | 692 }, |
| 692 } | 693 } |
| OLD | NEW |