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

Side by Side Diff: skia/skia.gyp

Issue 7969015: Remove a redundant line. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve conflict (CL r102082) Created 9 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 | 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 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'sources': [ 10 'sources': [
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
786 ], 786 ],
787 'defines': [ 787 'defines': [
788 'SK_MAX_SIZE_FOR_LCDTEXT=256', 788 'SK_MAX_SIZE_FOR_LCDTEXT=256',
789 ], 789 ],
790 }, { # use_glib == 0 790 }, { # use_glib == 0
791 'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ], 791 'sources/': [ ['exclude', '_linux\\.(cc|cpp)$'] ],
792 'sources!': [ 792 'sources!': [
793 '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', 793 '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
794 '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp', 794 '../third_party/skia/src/ports/SkFontHost_TryeType_Tables.cpp',
795 '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp', 795 '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
796 '../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
797 '../third_party/skia/src/ports/SkFontHost_tables.cpp', 796 '../third_party/skia/src/ports/SkFontHost_tables.cpp',
798 ], 797 ],
799 }], 798 }],
800 [ 'toolkit_uses_gtk == 1', { 799 [ 'toolkit_uses_gtk == 1', {
801 'dependencies': [ 800 'dependencies': [
802 '../build/linux/system.gyp:gdk', 801 '../build/linux/system.gyp:gdk',
803 ], 802 ],
804 }, { # toolkit_uses_gtk == 0 803 }, { # toolkit_uses_gtk == 0
805 'sources/': [ ['exclude', '_gtk\\.(cc|cpp)$'] ], 804 'sources/': [ ['exclude', '_gtk\\.(cc|cpp)$'] ],
806 }], 805 }],
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 ], 1018 ],
1020 'include_dirs': [ 1019 'include_dirs': [
1021 '..', 1020 '..',
1022 ], 1021 ],
1023 'sources': [ 1022 'sources': [
1024 'ext/image_operations_bench.cc', 1023 'ext/image_operations_bench.cc',
1025 ], 1024 ],
1026 }, 1025 },
1027 ], 1026 ],
1028 } 1027 }
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