Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Side by Side Diff: gyp/common_conditions.gypi

Issue 654663002: No threadsafe statics. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 '-Wall', 195 '-Wall',
196 '-Wextra', 196 '-Wextra',
197 '-Winit-self', 197 '-Winit-self',
198 '-Wpointer-arith', 198 '-Wpointer-arith',
199 199
200 '-Wno-c++11-extensions', 200 '-Wno-c++11-extensions',
201 '-Wno-unused-parameter', 201 '-Wno-unused-parameter',
202 ], 202 ],
203 'cflags_cc': [ 203 'cflags_cc': [
204 '-fno-rtti', 204 '-fno-rtti',
205 '-fno-threadsafe-statics', # Chrome disables this, so for safety we s hould too.
205 '-Wnon-virtual-dtor', 206 '-Wnon-virtual-dtor',
206 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i s POD. 207 '-Wno-invalid-offsetof', # GCC <4.6 is old-school strict about what i s POD.
207 ], 208 ],
208 'conditions': [ 209 'conditions': [
209 [ 'skia_os != "chromeos"', { 210 [ 'skia_os != "chromeos"', {
210 'conditions': [ 211 'conditions': [
211 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { 212 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
212 'cflags': [ 213 'cflags': [
213 '-m64', 214 '-m64',
214 ], 215 ],
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 [ 'skia_is_bot', { 632 [ 'skia_is_bot', {
632 'defines': [ 'SK_CRASH_HANDLER' ], 633 'defines': [ 'SK_CRASH_HANDLER' ],
633 }], 634 }],
634 635
635 ], # end 'conditions' 636 ], # end 'conditions'
636 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 637 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
637 'xcode_settings': { 638 'xcode_settings': {
638 'SYMROOT': '<(DEPTH)/xcodebuild', 639 'SYMROOT': '<(DEPTH)/xcodebuild',
639 }, 640 },
640 } 641 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698