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

Side by Side Diff: skia/skia.gyp

Issue 17484003: Roll Skia DEPS to r9694 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 6 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 | « DEPS ('k') | skia/skia_test_expectations.txt » ('j') | 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) 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 ], 254 ],
255 'sources!': [ 255 'sources!': [
256 '../third_party/skia/include/core/SkTypes.h', 256 '../third_party/skia/include/core/SkTypes.h',
257 ], 257 ],
258 'conditions': [ 258 'conditions': [
259 ['skia_support_gpu != 0', { 259 ['skia_support_gpu != 0', {
260 'includes': [ 260 'includes': [
261 '../third_party/skia/gyp/gpu.gypi', 261 '../third_party/skia/gyp/gpu.gypi',
262 ], 262 ],
263 'sources': [ 263 'sources': [
264 '<@(gr_sources)', 264 '<@(skgpu_sources)',
265 '<@(skgr_sources)',
266 ], 265 ],
267 'include_dirs': [ 266 'include_dirs': [
268 '../third_party/skia/include/gpu', 267 '../third_party/skia/include/gpu',
269 '../third_party/skia/include/gpu/gl', 268 '../third_party/skia/include/gpu/gl',
270 '../third_party/skia/src/gpu', 269 '../third_party/skia/src/gpu',
271 ], 270 ],
272 }, { # skia_support_gpu == 0 271 }, { # skia_support_gpu == 0
273 'defines': [ 272 'defines': [
274 'SK_SUPPORT_GPU=0', 273 'SK_SUPPORT_GPU=0',
275 ], 274 ],
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 'sources': [ 908 'sources': [
910 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', 909 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
911 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', 910 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
912 '../third_party/skia/src/opts/SkUtils_opts_none.cpp', 911 '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
913 ], 912 ],
914 }, 913 },
915 ], 914 ],
916 }], 915 }],
917 ], 916 ],
918 } 917 }
OLDNEW
« no previous file with comments | « DEPS ('k') | skia/skia_test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698