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

Unified Diff: skia/skia_chrome.gypi

Issue 19477005: Improve Skia configuration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Use os_posix for posix tests. Created 7 years, 2 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 | « skia/skia.gyp ('k') | skia/skia_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia_chrome.gypi
===================================================================
--- skia/skia_chrome.gypi (revision 229411)
+++ skia/skia_chrome.gypi (working copy)
@@ -20,10 +20,6 @@
],
},
- 'include_dirs': [
- '..',
- ],
-
'sources': [
'ext/analysis_canvas.cc',
'ext/analysis_canvas.h',
@@ -48,7 +44,6 @@
'ext/lazy_pixel_ref.h',
'ext/lazy_pixel_ref_utils.cc',
'ext/lazy_pixel_ref_utils.h',
- 'ext/SkThread_chrome.cc',
'ext/opacity_draw_filter.cc',
'ext/opacity_draw_filter.h',
'ext/paint_simplifier.cc',
@@ -83,14 +78,6 @@
'ext/vector_platform_device_skia.h',
],
'conditions': [
- # For POSIX platforms, prefer the Mutex implementation provided by Skia
- # since it does not generate static initializers.
- # TODO: should check if SK_USE_POSIX_THREADS is defined instead
- [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', {
- 'sources!': [
- 'ext/SkThread_chrome.cc',
- ],
- }],
[ 'OS == "android" and enable_printing == 0', {
'sources!': [
'ext/skia_utils_base.cc',
@@ -105,11 +92,6 @@
'skia_chrome_opts',
],
}],
- [ 'OS == "win"', {
- 'sources!': [
- 'ext/SkThread_chrome.cc',
- ],
- }],
# TODO(scottmg): http://crbug.com/177306
['clang==1', {
'xcode_settings': {
« no previous file with comments | « skia/skia.gyp ('k') | skia/skia_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698