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

Side by Side Diff: gyp/common_conditions.gypi

Issue 26142003: Enable -fPIE and -pie in tsan build. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Now more correcter. Created 7 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 | Annotate | Revision Log
« 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 ], 6 ],
7 'conditions' : [ 7 'conditions' : [
8 [ 'skia_gpu == 1', 8 [ 'skia_gpu == 1',
9 { 9 {
10 'defines': [ 10 'defines': [
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 'cflags': [ 282 'cflags': [
283 '-fsanitize=<(skia_sanitizer)', 283 '-fsanitize=<(skia_sanitizer)',
284 '-fno-omit-frame-pointer', 284 '-fno-omit-frame-pointer',
285 ], 285 ],
286 'ldflags': [ 286 'ldflags': [
287 '-fsanitize=<(skia_sanitizer)', 287 '-fsanitize=<(skia_sanitizer)',
288 ], 288 ],
289 'conditions' : [ 289 'conditions' : [
290 [ 'skia_sanitizer == "thread"', { 290 [ 'skia_sanitizer == "thread"', {
291 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], 291 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ],
292 'target_conditions': [
293 [ '_type == "executable"', {
294 'cflags': [ '-fPIE' ],
295 'ldflags': [ '-pie' ],
296 }],
297 ],
292 }], 298 }],
293 ], 299 ],
294 }], 300 }],
295 [ 'skia_clang_build', { 301 [ 'skia_clang_build', {
296 'cflags': [ 302 'cflags': [
297 # Extra warnings we like but that only Clang knows about. 303 # Extra warnings we like but that only Clang knows about.
298 '-Wstring-conversion', 304 '-Wstring-conversion',
299 ], 305 ],
300 }], 306 }],
301 ], 307 ],
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 'xcode_settings': { 499 'xcode_settings': {
494 'SYMROOT': '<(DEPTH)/xcodebuild', 500 'SYMROOT': '<(DEPTH)/xcodebuild',
495 }, 501 },
496 } 502 }
497 503
498 # Local Variables: 504 # Local Variables:
499 # tab-width:2 505 # tab-width:2
500 # indent-tabs-mode:nil 506 # indent-tabs-mode:nil
501 # End: 507 # End:
502 # vim: set expandtab tabstop=2 shiftwidth=2: 508 # vim: set expandtab tabstop=2 shiftwidth=2:
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