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

Unified Diff: skia/skia_chrome.gypi

Issue 59133008: ozone: Support building without cairo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & fix whitespace Created 7 years, 1 month 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/ext/platform_device.h ('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
diff --git a/skia/skia_chrome.gypi b/skia/skia_chrome.gypi
index c24bb7347f693cde3035e8b83953845edcf17200..06d547b81d532ddbac733362a7851c21ca4e83f0 100644
--- a/skia/skia_chrome.gypi
+++ b/skia/skia_chrome.gypi
@@ -26,13 +26,13 @@
'ext/benchmarking_canvas.cc',
'ext/benchmarking_canvas.h',
'ext/bitmap_platform_device.h',
- 'ext/bitmap_platform_device_android.cc',
- 'ext/bitmap_platform_device_android.h',
+ 'ext/bitmap_platform_device_cairo.cc',
+ 'ext/bitmap_platform_device_cairo.h',
'ext/bitmap_platform_device_data.h',
- 'ext/bitmap_platform_device_linux.cc',
- 'ext/bitmap_platform_device_linux.h',
'ext/bitmap_platform_device_mac.cc',
'ext/bitmap_platform_device_mac.h',
+ 'ext/bitmap_platform_device_skia.cc',
+ 'ext/bitmap_platform_device_skia.h',
'ext/bitmap_platform_device_win.cc',
'ext/bitmap_platform_device_win.h',
'ext/convolver.cc',
@@ -104,6 +104,11 @@
'-Wstring-conversion',
],
}],
+ [ 'OS != "android" and (OS != "linux" or use_cairo==1)', {
+ 'sources!': [
+ 'ext/bitmap_platform_device_skia.cc',
+ ],
+ }],
],
'target_conditions': [
« no previous file with comments | « skia/ext/platform_device.h ('k') | skia/skia_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698