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

Unified Diff: ui/gfx/gfx.gyp

Issue 27764002: Enable Ozone software implementation in GYP (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | ui/gfx/ozone/surface_factory_ozone.cc » ('j') | ui/gfx/ozone/surface_factory_ozone.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gfx.gyp
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index 48f0b2f98811f9864eb45beb51d30458ad5ae598..952be2a642602a5a0e3db2b0a705d2521b882113 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -135,6 +135,16 @@
'matrix3_f.cc',
'matrix3_f.h',
'native_widget_types.h',
+ 'ozone/impl/drm_skbitmap_ozone.cc',
+ 'ozone/impl/drm_skbitmap_ozone.h',
+ 'ozone/impl/drm_wrapper_ozone.cc',
+ 'ozone/impl/drm_wrapper_ozone.h',
+ 'ozone/impl/hardware_display_controller_ozone.cc',
+ 'ozone/impl/hardware_display_controller_ozone.h',
+ 'ozone/impl/software_surface_factory_ozone.cc',
+ 'ozone/impl/software_surface_factory_ozone.h',
+ 'ozone/impl/software_surface_ozone.cc',
+ 'ozone/impl/software_surface_ozone.h',
'ozone/surface_factory_ozone.cc',
'ozone/surface_factory_ozone.h',
'pango_util.cc',
@@ -357,6 +367,32 @@
'<(DEPTH)/build/linux/system.gyp:pangocairo',
],
}],
+ ['use_ozone==1', {
rjkroege 2013/10/18 14:54:05 it would be nicer if you make this block look like
dnicoara 2013/10/18 16:00:50 Done.
+ 'conditions': [
+ ['sysroot!=""', {
+ 'variables': {
+ 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
+ },
+ }, {
+ 'variables': {
+ 'pkg-config': 'pkg-config'
+ },
+ }],
+ ],
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags libdrm)',
+ ],
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(<(pkg-config) --cflags libdrm)',
+ ],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '<!@(<(pkg-config) --libs-only-l libdrm)',
+ ],
+ },
+ }],
],
'target_conditions': [
# Need 'target_conditions' to override default filename_rules to include
« no previous file with comments | « no previous file | ui/gfx/ozone/surface_factory_ozone.cc » ('j') | ui/gfx/ozone/surface_factory_ozone.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698