summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-10 11:59:24 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-10 11:59:24 +0000
commitc9a1784876eaf8b9091079632fdb6890c4eaa2a4 (patch)
treedd39e3ddaba0f8695c4fb659c202dea3312419b3
parent06181e514d756e73b30e09df7b303300ad71d04e (diff)
downloadchromium_src-c9a1784876eaf8b9091079632fdb6890c4eaa2a4.zip
chromium_src-c9a1784876eaf8b9091079632fdb6890c4eaa2a4.tar.gz
chromium_src-c9a1784876eaf8b9091079632fdb6890c4eaa2a4.tar.bz2
ozone: Create a separate small gfx_ozone target.
Instead of bundling up the ozone stuff into the larger gfx.gyp:gfx target, split up the ozone-related code into a smaller gfx_ozone target with a small dependency (base, skia). This allows ozone-platforms to implement the ozone interface without bringing along the rest of gfx. BUG=361137 R=rjkroege@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/271303002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269570 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/gfx/gfx.gyp8
-rw-r--r--ui/gfx/ozone/gfx_ozone.gyp31
-rw-r--r--ui/ozone/ozone.gyp1
3 files changed, 32 insertions, 8 deletions
diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp
index f46a0c1..83d2a64 100644
--- a/ui/gfx/gfx.gyp
+++ b/ui/gfx/gfx.gyp
@@ -203,14 +203,6 @@
'nine_image_painter.cc',
'nine_image_painter.h',
'overlay_transform.h',
- 'ozone/impl/file_surface_factory.cc',
- 'ozone/impl/file_surface_factory.h',
- 'ozone/surface_factory_ozone.cc',
- 'ozone/surface_factory_ozone.h',
- 'ozone/surface_ozone_egl.h',
- 'ozone/surface_ozone_canvas.h',
- 'ozone/overlay_candidates_ozone.cc',
- 'ozone/overlay_candidates_ozone.h',
'pango_util.cc',
'pango_util.h',
'path.cc',
diff --git a/ui/gfx/ozone/gfx_ozone.gyp b/ui/gfx/ozone/gfx_ozone.gyp
new file mode 100644
index 0000000..2d8a2fe
--- /dev/null
+++ b/ui/gfx/ozone/gfx_ozone.gyp
@@ -0,0 +1,31 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ 'variables': {
+ 'chromium_code': 1,
+ },
+ 'targets': [{
+ 'target_name': 'gfx_ozone',
+ 'type': '<(component)',
+ 'defines': [
+ 'GFX_IMPLEMENTATION',
+ ],
+ 'dependencies': [
+ '../../../base/base.gyp:base',
+ '../../../skia/skia.gyp:skia',
+ '../gfx.gyp:gfx_geometry',
+ ],
+ 'sources': [
+ 'impl/file_surface_factory.cc',
+ 'impl/file_surface_factory.h',
+ 'surface_factory_ozone.cc',
+ 'surface_factory_ozone.h',
+ 'surface_ozone_egl.h',
+ 'surface_ozone_canvas.h',
+ 'overlay_candidates_ozone.cc',
+ 'overlay_candidates_ozone.h',
+ ],
+ }],
+}
diff --git a/ui/ozone/ozone.gyp b/ui/ozone/ozone.gyp
index 9e3bac6..10a4a40 100644
--- a/ui/ozone/ozone.gyp
+++ b/ui/ozone/ozone.gyp
@@ -20,6 +20,7 @@
'<(DEPTH)/ui/events/events.gyp:events',
'<(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)',