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

Unified Diff: ui/ozone/ozone.gyp

Issue 312393002: ozone: Move the factory interfaces into a common target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-r278697 Created 6 years, 6 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 | « ui/gl/gl_surface_ozone.cc ('k') | ui/ozone/ozone_base_export.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/ozone.gyp
diff --git a/ui/ozone/ozone.gyp b/ui/ozone/ozone.gyp
index 0eafee131d5ceeda9e4d6222ff56b4290b586e70..5a42e7cdd7d868eaf2a031db9051023de2165cc4 100644
--- a/ui/ozone/ozone.gyp
+++ b/ui/ozone/ozone.gyp
@@ -15,6 +15,30 @@
},
'targets': [
{
+ 'target_name': 'ozone_base',
+ 'type': '<(component)',
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/skia/skia.gyp:skia',
+ '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+ ],
+ 'defines': [
+ 'OZONE_BASE_IMPLEMENTATION',
+ ],
+ 'sources': [
+ 'public/cursor_factory_ozone.cc',
+ 'public/cursor_factory_ozone.h',
+ 'public/event_factory_ozone.cc',
+ 'public/event_factory_ozone.h',
+ 'public/overlay_candidates_ozone.cc',
+ 'public/overlay_candidates_ozone.h',
+ 'public/surface_factory_ozone.cc',
+ 'public/surface_factory_ozone.h',
+ 'public/surface_ozone_canvas.h',
+ 'public/surface_ozone_egl.h',
+ ],
+ },
+ {
'target_name': 'ozone',
'type': '<(component)',
'dependencies': [
@@ -23,10 +47,10 @@
'<(DEPTH)/ui/events/ozone/events_ozone.gyp:events_ozone',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
- '<(DEPTH)/ui/gfx/ozone/gfx_ozone.gyp:gfx_ozone',
'<(DEPTH)/skia/skia.gyp:skia',
'<@(external_ozone_platform_deps)',
'<@(internal_ozone_platform_deps)',
+ 'ozone_base',
],
'defines': [
'OZONE_IMPLEMENTATION',
@@ -122,7 +146,7 @@
'<(DEPTH)/ui/display/display.gyp:display_types',
],
}],
- ]
+ ],
},
{
'target_name': 'ozone_unittests',
@@ -132,6 +156,7 @@
],
'dependencies': [
'ozone',
+ 'ozone_base',
'../../base/base.gyp:base',
'../../base/base.gyp:test_support_base',
'../../testing/gtest.gyp:gtest',
« no previous file with comments | « ui/gl/gl_surface_ozone.cc ('k') | ui/ozone/ozone_base_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698