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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: skia/skia.gyp

Issue 9834048: Roll Skia DEPS to 3470 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: include SkTypefaceCache.cpp in android build Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « printing/pdf_metafile_skia.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia.gyp
===================================================================
--- skia/skia.gyp (revision 128469)
+++ skia/skia.gyp (working copy)
@@ -383,7 +383,6 @@
'../third_party/skia/src/gpu/GrPathRendererChain.h',
'../third_party/skia/src/gpu/GrPathUtils.cpp',
'../third_party/skia/src/gpu/GrPlotMgr.h',
- '../third_party/skia/src/gpu/GrPrintf_skia.cpp',
'../third_party/skia/src/gpu/GrRandom.h',
'../third_party/skia/src/gpu/GrRectanizer.h',
'../third_party/skia/src/gpu/GrRectanizer_fifo.cpp',
@@ -468,19 +467,28 @@
'../third_party/skia/src/opts/opts_check_SSE2.cpp',
- '../third_party/skia/src/pdf/SkBitSet.cpp',
'../third_party/skia/src/pdf/SkPDFCatalog.cpp',
+ '../third_party/skia/src/pdf/SkPDFCatalog.h',
'../third_party/skia/src/pdf/SkPDFDevice.cpp',
'../third_party/skia/src/pdf/SkPDFDocument.cpp',
'../third_party/skia/src/pdf/SkPDFFont.cpp',
+ '../third_party/skia/src/pdf/SkPDFFont.h',
'../third_party/skia/src/pdf/SkPDFFormXObject.cpp',
+ '../third_party/skia/src/pdf/SkPDFFormXObject.h',
'../third_party/skia/src/pdf/SkPDFGraphicState.cpp',
+ '../third_party/skia/src/pdf/SkPDFGraphicState.h',
'../third_party/skia/src/pdf/SkPDFImage.cpp',
+ '../third_party/skia/src/pdf/SkPDFImage.h',
'../third_party/skia/src/pdf/SkPDFPage.cpp',
+ '../third_party/skia/src/pdf/SkPDFPage.h',
'../third_party/skia/src/pdf/SkPDFShader.cpp',
+ '../third_party/skia/src/pdf/SkPDFShader.h',
'../third_party/skia/src/pdf/SkPDFStream.cpp',
+ '../third_party/skia/src/pdf/SkPDFStream.h',
'../third_party/skia/src/pdf/SkPDFTypes.cpp',
+ '../third_party/skia/src/pdf/SkPDFTypes.h',
'../third_party/skia/src/pdf/SkPDFUtils.cpp',
+ '../third_party/skia/src/pdf/SkPDFUtils.h',
'../third_party/skia/src/ports/FontHostConfiguration_android.cpp',
#'../third_party/skia/src/ports/SkFontHost_FONTPATH.cpp',
@@ -517,6 +525,8 @@
'../third_party/skia/include/utils/SkDeferredCanvas.h',
'../third_party/skia/include/utils/SkMatrix44.h',
'../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp',
+ '../third_party/skia/src/utils/SkBitSet.cpp',
+ '../third_party/skia/src/utils/SkBitSet.h',
'../third_party/skia/src/utils/SkDeferredCanvas.cpp',
'../third_party/skia/src/utils/SkMatrix44.cpp',
@@ -660,19 +670,8 @@
'../third_party/skia/include/gpu/SkGr.h',
'../third_party/skia/include/gpu/SkGrTexturePixelRef.h',
- '../third_party/skia/include/pdf/SkBitSet.h',
- '../third_party/skia/include/pdf/SkPDFCatalog.h',
'../third_party/skia/include/pdf/SkPDFDevice.h',
'../third_party/skia/include/pdf/SkPDFDocument.h',
- '../third_party/skia/include/pdf/SkPDFFont.h',
- '../third_party/skia/include/pdf/SkPDFFormXObject.h',
- '../third_party/skia/include/pdf/SkPDFGraphicState.h',
- '../third_party/skia/include/pdf/SkPDFImage.h',
- '../third_party/skia/include/pdf/SkPDFPage.h',
- '../third_party/skia/include/pdf/SkPDFShader.h',
- '../third_party/skia/include/pdf/SkPDFStream.h',
- '../third_party/skia/include/pdf/SkPDFTypes.h',
- '../third_party/skia/include/pdf/SkPDFUtils.h',
'../third_party/skia/include/ports/SkStream_Win.h',
'../third_party/skia/include/ports/SkTypeface_win.h',
@@ -746,6 +745,7 @@
'../third_party/skia/include/ports',
'../third_party/skia/include/utils',
'../third_party/skia/src/core',
+ '../third_party/skia/src/utils',
],
'msvs_disabled_warnings': [4244, 4267,4345, 4390, 4554, 4800],
'mac_framework_dirs': [
@@ -903,7 +903,6 @@
],
'sources!': [
'ext/vector_platform_device_skia.cc',
- '../third_party/skia/src/core/SkTypefaceCache.cpp',
'../third_party/skia/src/ports/SkFontHost_gamma_none.cpp',
],
'export_dependent_settings': [
« no previous file with comments | « printing/pdf_metafile_skia.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698