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

Side by Side Diff: skia/skia.gyp

Issue 10928093: Adds an iOS implementation of gfx::Image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@skia
Patch Set: Nits. Created 8 years, 3 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'skia', 8 'target_name': 'skia',
9 'type': '<(component)', 9 'type': '<(component)',
10 'variables': { 10 'variables': {
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 '../third_party/skia/include/utils/mac', 442 '../third_party/skia/include/utils/mac',
443 ], 443 ],
444 'dependencies': [ 444 'dependencies': [
445 'skia_opts_ios', 445 'skia_opts_ios',
446 ], 446 ],
447 'dependencies!': [ 447 'dependencies!': [
448 'skia_opts', 448 'skia_opts',
449 '../third_party/sfntly/sfntly.gyp:sfntly', 449 '../third_party/sfntly/sfntly.gyp:sfntly',
450 ], 450 ],
451 'sources': [ 451 'sources': [
452 'ext/skia_utils_ios.mm',
453 'ext/skia_utils_ios.h',
Nico 2012/09/14 00:53:54 Can't you add that to the global source list? The
rohitrao (ping after 24h) 2012/09/14 01:07:18 The mac trybots failed trying to compile these fil
Nico 2012/09/14 01:13:37 Hm, looks like it doesn't set chromium_code at the
rohitrao (ping after 24h) 2012/09/14 01:30:29 Aha, I didn't know the file pattern rules were gat
452 # This file is used on both iOS and Mac, so it should be removed 454 # This file is used on both iOS and Mac, so it should be removed
453 # from the ios and mac conditions and moved into the main sources 455 # from the ios and mac conditions and moved into the main sources
454 # list. 456 # list.
455 '../third_party/skia/src/utils/mac/SkStream_mac.cpp', 457 '../third_party/skia/src/utils/mac/SkStream_mac.cpp',
456 ], 458 ],
457 'sources/': [ 459 'sources/': [
458 ['exclude', '/pdf/'], 460 ['exclude', '/pdf/'],
459 ['exclude', '^ext/vector_platform_device_skia\\.'], 461 ['exclude', '^ext/vector_platform_device_skia\\.'],
460 ['exclude', 'opts_check_SSE2\\.cpp$'], 462 ['exclude', 'opts_check_SSE2\\.cpp$'],
461 ['exclude', 'SkFontHost_tables\\.cpp$',], 463 ['exclude', 'SkFontHost_tables\\.cpp$',],
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 }], 588 }],
587 ], 589 ],
588 }, 590 },
589 'target_conditions': [ 591 'target_conditions': [
590 # Pull in specific Mac files for iOS (which have been filtered out 592 # Pull in specific Mac files for iOS (which have been filtered out
591 # by file name rules). 593 # by file name rules).
592 [ 'OS == "ios"', { 594 [ 'OS == "ios"', {
593 'sources/': [ 595 'sources/': [
594 ['include', 'SkFontHost_mac\\.cpp$',], 596 ['include', 'SkFontHost_mac\\.cpp$',],
595 ['include', 'SkStream_mac\\.cpp$',], 597 ['include', 'SkStream_mac\\.cpp$',],
598 ['include', 'SkCreateCGImageRef\\.cpp$',],
596 ], 599 ],
597 }], 600 }],
598 ], 601 ],
599 }, 602 },
600 603
601 # Due to an unfortunate intersection of lameness between gcc and gyp, 604 # Due to an unfortunate intersection of lameness between gcc and gyp,
602 # we have to build the *_SSE2.cpp files in a separate target. The 605 # we have to build the *_SSE2.cpp files in a separate target. The
603 # gcc lameness is that, in order to compile SSE2 intrinsics code, it 606 # gcc lameness is that, in order to compile SSE2 intrinsics code, it
604 # must be passed the -msse2 flag. However, with this flag, it may 607 # must be passed the -msse2 flag. However, with this flag, it may
605 # emit SSE2 instructions even for scalar code, such as the CPUID 608 # emit SSE2 instructions even for scalar code, such as the CPUID
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
827 'sources': [ 830 'sources': [
828 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', 831 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
829 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', 832 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
830 '../third_party/skia/src/opts/SkUtils_opts_none.cpp', 833 '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
831 ], 834 ],
832 }, 835 },
833 ], 836 ],
834 }], 837 }],
835 ], 838 ],
836 } 839 }
OLDNEW
« no previous file with comments | « skia/ext/skia_utils_ios.mm ('k') | ui/base/layout.cc » ('j') | ui/base/layout.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698