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

Side by Side Diff: skia/skia.gyp

Issue 10829264: Roll Skia DEPS to 5029 & skia.gyp changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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') | 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) 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 '../third_party/skia/src/core/SkMetaData.cpp', 265 '../third_party/skia/src/core/SkMetaData.cpp',
266 '../third_party/skia/src/core/SkOrderedReadBuffer.cpp', 266 '../third_party/skia/src/core/SkOrderedReadBuffer.cpp',
267 '../third_party/skia/src/core/SkOrderedWriteBuffer.cpp', 267 '../third_party/skia/src/core/SkOrderedWriteBuffer.cpp',
268 '../third_party/skia/src/core/SkPackBits.cpp', 268 '../third_party/skia/src/core/SkPackBits.cpp',
269 '../third_party/skia/src/core/SkPaint.cpp', 269 '../third_party/skia/src/core/SkPaint.cpp',
270 '../third_party/skia/src/core/SkPath.cpp', 270 '../third_party/skia/src/core/SkPath.cpp',
271 '../third_party/skia/src/core/SkPathEffect.cpp', 271 '../third_party/skia/src/core/SkPathEffect.cpp',
272 '../third_party/skia/src/core/SkPathHeap.cpp', 272 '../third_party/skia/src/core/SkPathHeap.cpp',
273 '../third_party/skia/src/core/SkPathHeap.h', 273 '../third_party/skia/src/core/SkPathHeap.h',
274 '../third_party/skia/src/core/SkPathMeasure.cpp', 274 '../third_party/skia/src/core/SkPathMeasure.cpp',
275 '../third_party/skia/src/core/SkPerspIter.h',
275 '../third_party/skia/src/core/SkPicture.cpp', 276 '../third_party/skia/src/core/SkPicture.cpp',
276 '../third_party/skia/src/core/SkPictureFlat.cpp', 277 '../third_party/skia/src/core/SkPictureFlat.cpp',
277 '../third_party/skia/src/core/SkPictureFlat.h', 278 '../third_party/skia/src/core/SkPictureFlat.h',
278 '../third_party/skia/src/core/SkPicturePlayback.cpp', 279 '../third_party/skia/src/core/SkPicturePlayback.cpp',
279 '../third_party/skia/src/core/SkPicturePlayback.h', 280 '../third_party/skia/src/core/SkPicturePlayback.h',
280 '../third_party/skia/src/core/SkPictureRecord.cpp', 281 '../third_party/skia/src/core/SkPictureRecord.cpp',
281 '../third_party/skia/src/core/SkPictureRecord.h', 282 '../third_party/skia/src/core/SkPictureRecord.h',
282 '../third_party/skia/src/core/SkPixelRef.cpp', 283 '../third_party/skia/src/core/SkPixelRef.cpp',
283 '../third_party/skia/src/core/SkPoint.cpp', 284 '../third_party/skia/src/core/SkPoint.cpp',
284 '../third_party/skia/src/core/SkProcSpriteBlitter.cpp', 285 '../third_party/skia/src/core/SkProcSpriteBlitter.cpp',
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 '../third_party/skia/include/core/SkMask.h', 635 '../third_party/skia/include/core/SkMask.h',
635 '../third_party/skia/include/core/SkMaskFilter.h', 636 '../third_party/skia/include/core/SkMaskFilter.h',
636 '../third_party/skia/include/core/SkMath.h', 637 '../third_party/skia/include/core/SkMath.h',
637 '../third_party/skia/include/core/SkMatrix.h', 638 '../third_party/skia/include/core/SkMatrix.h',
638 '../third_party/skia/include/core/SkOSFile.h', 639 '../third_party/skia/include/core/SkOSFile.h',
639 '../third_party/skia/include/core/SkPackBits.h', 640 '../third_party/skia/include/core/SkPackBits.h',
640 '../third_party/skia/include/core/SkPaint.h', 641 '../third_party/skia/include/core/SkPaint.h',
641 '../third_party/skia/include/core/SkPath.h', 642 '../third_party/skia/include/core/SkPath.h',
642 '../third_party/skia/include/core/SkPathEffect.h', 643 '../third_party/skia/include/core/SkPathEffect.h',
643 '../third_party/skia/include/core/SkPathMeasure.h', 644 '../third_party/skia/include/core/SkPathMeasure.h',
644 '../third_party/skia/include/core/SkPerspIter.h',
645 '../third_party/skia/include/core/SkPicture.h', 645 '../third_party/skia/include/core/SkPicture.h',
646 '../third_party/skia/include/core/SkPixelRef.h', 646 '../third_party/skia/include/core/SkPixelRef.h',
647 '../third_party/skia/include/core/SkPoint.h', 647 '../third_party/skia/include/core/SkPoint.h',
648 '../third_party/skia/include/core/SkPtrRecorder.h', 648 '../third_party/skia/include/core/SkPtrRecorder.h',
649 '../third_party/skia/include/core/SkRandom.h', 649 '../third_party/skia/include/core/SkRandom.h',
650 '../third_party/skia/include/core/SkRasterizer.h', 650 '../third_party/skia/include/core/SkRasterizer.h',
651 '../third_party/skia/include/core/SkReader32.h', 651 '../third_party/skia/include/core/SkReader32.h',
652 '../third_party/skia/include/core/SkRect.h', 652 '../third_party/skia/include/core/SkRect.h',
653 '../third_party/skia/include/core/SkRefCnt.h', 653 '../third_party/skia/include/core/SkRefCnt.h',
654 '../third_party/skia/include/core/SkRefDict.h', 654 '../third_party/skia/include/core/SkRefDict.h',
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 # targets via common.gypi. 1245 # targets via common.gypi.
1246 'cflags!': [ 1246 'cflags!': [
1247 '-fno-omit-frame-pointer', 1247 '-fno-omit-frame-pointer',
1248 ], 1248 ],
1249 'cflags': [ 1249 'cflags': [
1250 '-fomit-frame-pointer', 1250 '-fomit-frame-pointer',
1251 ], 1251 ],
1252 'sources': [ 1252 'sources': [
1253 '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp', 1253 '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
1254 '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp', 1254 '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
1255 '../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
1255 '../third_party/skia/src/opts/opts_check_arm.cpp', 1256 '../third_party/skia/src/opts/opts_check_arm.cpp',
1256 ], 1257 ],
1257 }], 1258 }],
1258 [ 'armv7 == 1 and arm_neon == 0', { 1259 [ 'armv7 == 1 and arm_neon == 0', {
1259 'sources': [ 1260 'sources': [
1260 '../third_party/skia/src/opts/memset.arm.S', 1261 '../third_party/skia/src/opts/memset.arm.S',
1261 ], 1262 ],
1262 }], 1263 }],
1263 [ 'armv7 == 1 and arm_neon == 1', { 1264 [ 'armv7 == 1 and arm_neon == 1', {
1264 'sources': [ 1265 'sources': [
1265 '../third_party/skia/src/opts/memset16_neon.S', 1266 '../third_party/skia/src/opts/memset16_neon.S',
1266 '../third_party/skia/src/opts/memset32_neon.S', 1267 '../third_party/skia/src/opts/memset32_neon.S',
1267 '../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp ', 1268 '../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp ',
1268 '../third_party/skia/src/opts/SkBitmapProcState_matrix_clamp_neon.h' , 1269 '../third_party/skia/src/opts/SkBitmapProcState_matrix_clamp_neon.h' ,
1269 '../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h ', 1270 '../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h ',
1271 '../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
1270 ], 1272 ],
1271 }], 1273 }],
1272 [ 'target_arch == "arm" and armv7 != 1', { 1274 [ 'target_arch == "arm" and armv7 != 1', {
1273 'sources': [ 1275 'sources': [
1274 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', 1276 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
1275 ], 1277 ],
1276 'sources!': [ 1278 'sources!': [
1277 '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp', 1279 '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
1278 ], 1280 ],
1279 }], 1281 }],
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 ], 1342 ],
1341 'include_dirs': [ 1343 'include_dirs': [
1342 '..', 1344 '..',
1343 ], 1345 ],
1344 'sources': [ 1346 'sources': [
1345 'ext/image_operations_bench.cc', 1347 'ext/image_operations_bench.cc',
1346 ], 1348 ],
1347 }, 1349 },
1348 ], 1350 ],
1349 } 1351 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698