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

Side by Side Diff: trunk/gyp/common_conditions.gypi

Issue 14620020: add direct_dependencies for picture_utils, and add cflags_cc for android's gypi (Closed) Base URL: http://skia.googlecode.com/svn/
Patch Set: Created 7 years, 7 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 | trunk/gyp/tools.gyp » ('j') | 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_HINTING_SCALE_FACTOR', 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR',
7 ], 7 ],
8 'conditions' : [ 8 'conditions' : [
9 [ 'skia_gpu == 1', 9 [ 'skia_gpu == 1',
10 { 10 {
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 }, 304 },
305 }, 305 },
306 'libraries': [ 306 'libraries': [
307 '-lstdc++', 307 '-lstdc++',
308 '-lm', 308 '-lm',
309 '-llog', 309 '-llog',
310 ], 310 ],
311 'cflags': [ 311 'cflags': [
312 '-Wall', 312 '-Wall',
313 '-fno-exceptions', 313 '-fno-exceptions',
314 '-fno-rtti',
315 '-fstrict-aliasing', 314 '-fstrict-aliasing',
316 '-fuse-ld=gold', 315 '-fuse-ld=gold',
317 ], 316 ],
317 'cflags_cc': [
318 '-fno-rtti',
319 ],
318 'conditions': [ 320 'conditions': [
319 [ 'skia_warnings_as_errors', { 321 [ 'skia_warnings_as_errors', {
320 'cflags': [ 322 'cflags': [
321 '-Werror', 323 '-Werror',
322 ], 324 ],
323 }], 325 }],
324 [ 'skia_profile_enabled == 1', { 326 [ 'skia_profile_enabled == 1', {
325 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], 327 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
326 }], 328 }],
327 [ 'skia_arch_type == "arm" and arm_thumb == 1', { 329 [ 'skia_arch_type == "arm" and arm_thumb == 1', {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 'xcode_settings': { 378 'xcode_settings': {
377 'SYMROOT': '<(DEPTH)/xcodebuild', 379 'SYMROOT': '<(DEPTH)/xcodebuild',
378 }, 380 },
379 } 381 }
380 382
381 # Local Variables: 383 # Local Variables:
382 # tab-width:2 384 # tab-width:2
383 # indent-tabs-mode:nil 385 # indent-tabs-mode:nil
384 # End: 386 # End:
385 # vim: set expandtab tabstop=2 shiftwidth=2: 387 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | trunk/gyp/tools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698