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

Side by Side Diff: skia/skia_chrome.gypi

Issue 466223008: Adds skia/config/SkUserConfig.h to skia_library.gypi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: skia_chrome Created 6 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 | « skia/BUILD.gn ('k') | 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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 # This gypi file contains all the Chrome-specific enhancements to Skia. 6 # This gypi file contains all the Chrome-specific enhancements to Skia.
7 # In component mode (shared_lib) it is folded into a single shared library with 7 # In component mode (shared_lib) it is folded into a single shared library with
8 # the Skia files but in all other cases it is a separate library. 8 # the Skia files but in all other cases it is a separate library.
9 { 9 {
10 'dependencies': [ 10 'dependencies': [
11 'skia_library', 11 'skia_library',
12 'skia_chrome_opts', 12 'skia_chrome_opts',
13 '../base/base.gyp:base', 13 '../base/base.gyp:base',
14 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations', 14 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations',
15 ], 15 ],
16 16
17 'direct_dependent_settings': { 17 'direct_dependent_settings': {
18 'include_dirs': [ 18 'include_dirs': [
19 'ext', 19 'ext',
20 ], 20 ],
21 }, 21 },
22 'variables': { 22 'variables': {
23 # TODO(scottmg): http://crbug.com/177306 23 # TODO(scottmg): http://crbug.com/177306
24 'clang_warning_flags_unset': [ 24 'clang_warning_flags_unset': [
25 # Don't warn about string->bool used in asserts. 25 # Don't warn about string->bool used in asserts.
26 '-Wstring-conversion', 26 '-Wstring-conversion',
27 ], 27 ],
28 }, 28 },
29 'sources': [ 29 'sources': [
30 'config/SkUserConfig.h',
31
30 # Note: file list duplicated in GN build. 32 # Note: file list duplicated in GN build.
31 'ext/analysis_canvas.cc', 33 'ext/analysis_canvas.cc',
32 'ext/analysis_canvas.h', 34 'ext/analysis_canvas.h',
33 'ext/benchmarking_canvas.cc', 35 'ext/benchmarking_canvas.cc',
34 'ext/benchmarking_canvas.h', 36 'ext/benchmarking_canvas.h',
35 'ext/bitmap_platform_device.h', 37 'ext/bitmap_platform_device.h',
36 'ext/bitmap_platform_device_cairo.cc', 38 'ext/bitmap_platform_device_cairo.cc',
37 'ext/bitmap_platform_device_cairo.h', 39 'ext/bitmap_platform_device_cairo.h',
38 'ext/bitmap_platform_device_mac.cc', 40 'ext/bitmap_platform_device_mac.cc',
39 'ext/bitmap_platform_device_mac.h', 41 'ext/bitmap_platform_device_mac.h',
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 'target_conditions': [ 117 'target_conditions': [
116 # Pull in specific linux files for android (which have been filtered out 118 # Pull in specific linux files for android (which have been filtered out
117 # by file name rules). 119 # by file name rules).
118 [ 'OS == "android"', { 120 [ 'OS == "android"', {
119 'sources/': [ 121 'sources/': [
120 ['include', 'ext/platform_device_linux\\.cc$'], 122 ['include', 'ext/platform_device_linux\\.cc$'],
121 ], 123 ],
122 }], 124 }],
123 ], 125 ],
124 } 126 }
OLDNEW
« no previous file with comments | « skia/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698