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

Side by Side Diff: ui/ozone/ozone.gyp

Issue 1824993004: Separate gfx_ipc into skia-dependent and non-skia-dependent parts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address nits from tsepez@ Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « ui/ozone/common/gpu/ozone_gpu_messages.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Normally, the external_ozone_platform* variables below can be 8 # Normally, the external_ozone_platform* variables below can be
9 # overridden by supplement.gypi which must exist exactly one level 9 # overridden by supplement.gypi which must exist exactly one level
10 # below the top-level src directory. They can now also be set in 10 # below the top-level src directory. They can now also be set in
(...skipping 19 matching lines...) Expand all
30 'target_name': 'ozone_base', 30 'target_name': 'ozone_base',
31 'type': '<(component)', 31 'type': '<(component)',
32 'dependencies': [ 32 'dependencies': [
33 '<(DEPTH)/base/base.gyp:base', 33 '<(DEPTH)/base/base.gyp:base',
34 '<(DEPTH)/ipc/ipc.gyp:ipc', 34 '<(DEPTH)/ipc/ipc.gyp:ipc',
35 '<(DEPTH)/skia/skia.gyp:skia', 35 '<(DEPTH)/skia/skia.gyp:skia',
36 '<(DEPTH)/ui/display/display.gyp:display_types', 36 '<(DEPTH)/ui/display/display.gyp:display_types',
37 '<(DEPTH)/ui/display/display.gyp:display_util', 37 '<(DEPTH)/ui/display/display.gyp:display_util',
38 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', 38 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
39 '<(DEPTH)/ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc', 39 '<(DEPTH)/ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc',
40 '<(DEPTH)/ui/gfx/ipc/skia/gfx_ipc_skia.gyp:gfx_ipc_skia',
40 ], 41 ],
41 'defines': [ 42 'defines': [
42 'OZONE_BASE_IMPLEMENTATION', 43 'OZONE_BASE_IMPLEMENTATION',
43 ], 44 ],
44 'sources': [ 45 'sources': [
45 'public/client_native_pixmap.h', 46 'public/client_native_pixmap.h',
46 'public/cursor_factory_ozone.cc', 47 'public/cursor_factory_ozone.cc',
47 'public/cursor_factory_ozone.h', 48 'public/cursor_factory_ozone.h',
48 'public/gpu_platform_support.cc', 49 'public/gpu_platform_support.cc',
49 'public/gpu_platform_support.h', 50 'public/gpu_platform_support.h',
(...skipping 20 matching lines...) Expand all
70 'target_name': 'ozone_common', 71 'target_name': 'ozone_common',
71 'type': 'static_library', 72 'type': 'static_library',
72 'dependencies': [ 73 'dependencies': [
73 'ozone_base', 74 'ozone_base',
74 '<(DEPTH)/base/base.gyp:base', 75 '<(DEPTH)/base/base.gyp:base',
75 '<(DEPTH)/ipc/ipc.gyp:ipc', 76 '<(DEPTH)/ipc/ipc.gyp:ipc',
76 '<(DEPTH)/skia/skia.gyp:skia', 77 '<(DEPTH)/skia/skia.gyp:skia',
77 '<(DEPTH)/ui/display/display.gyp:display_types', 78 '<(DEPTH)/ui/display/display.gyp:display_types',
78 '<(DEPTH)/ui/display/display.gyp:display_util', 79 '<(DEPTH)/ui/display/display.gyp:display_util',
79 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', 80 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
80 '<(DEPTH)/ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc', 81 '<(DEPTH)/ui/gfx/ipc/skia/gfx_ipc_skia.gyp:gfx_ipc_skia',
qiangchen 2016/04/07 19:41:44 You removed gfx_ipc here. This is the reason that
81 ], 82 ],
82 'sources': [ 83 'sources': [
83 'common/display_mode_proxy.cc', 84 'common/display_mode_proxy.cc',
84 'common/display_mode_proxy.h', 85 'common/display_mode_proxy.h',
85 'common/display_snapshot_proxy.cc', 86 'common/display_snapshot_proxy.cc',
86 'common/display_snapshot_proxy.h', 87 'common/display_snapshot_proxy.h',
87 'common/display_util.cc', 88 'common/display_util.cc',
88 'common/display_util.h', 89 'common/display_util.h',
89 'common/egl_util.cc', 90 'common/egl_util.cc',
90 'common/egl_util.h', 91 'common/egl_util.h',
(...skipping 16 matching lines...) Expand all
107 '<(DEPTH)/base/base.gyp:base', 108 '<(DEPTH)/base/base.gyp:base',
108 '<(DEPTH)/ipc/ipc.gyp:ipc', 109 '<(DEPTH)/ipc/ipc.gyp:ipc',
109 '<(DEPTH)/skia/skia.gyp:skia', 110 '<(DEPTH)/skia/skia.gyp:skia',
110 '<(DEPTH)/ui/display/display.gyp:display_types', 111 '<(DEPTH)/ui/display/display.gyp:display_types',
111 '<(DEPTH)/ui/display/display.gyp:display_util', 112 '<(DEPTH)/ui/display/display.gyp:display_util',
112 '<(DEPTH)/ui/events/events.gyp:events', 113 '<(DEPTH)/ui/events/events.gyp:events',
113 '<(DEPTH)/ui/events/devices/events_devices.gyp:events_devices', 114 '<(DEPTH)/ui/events/devices/events_devices.gyp:events_devices',
114 '<(DEPTH)/ui/events/ozone/events_ozone.gyp:events_ozone', 115 '<(DEPTH)/ui/events/ozone/events_ozone.gyp:events_ozone',
115 '<(DEPTH)/ui/gfx/gfx.gyp:gfx', 116 '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
116 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', 117 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
117 '<(DEPTH)/ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc', 118 '<(DEPTH)/ui/gfx/ipc/skia/gfx_ipc_skia.gyp:gfx_ipc_skia',
qiangchen 2016/04/07 19:41:44 ditto
118 '<@(external_ozone_platform_deps)', 119 '<@(external_ozone_platform_deps)',
119 '<@(internal_ozone_platform_deps)', 120 '<@(internal_ozone_platform_deps)',
120 'ozone_base', 121 'ozone_base',
121 ], 122 ],
122 'defines': [ 123 'defines': [
123 'OZONE_IMPLEMENTATION', 124 'OZONE_IMPLEMENTATION',
124 ], 125 ],
125 'variables': { 126 'variables': {
126 'platform_list_cc_file': '<(INTERMEDIATE_DIR)/ui/ozone/platform_list.cc' , 127 'platform_list_cc_file': '<(INTERMEDIATE_DIR)/ui/ozone/platform_list.cc' ,
127 'platform_list_h_file': '<(SHARED_INTERMEDIATE_DIR)/ui/ozone/platform_li st.h', 128 'platform_list_h_file': '<(SHARED_INTERMEDIATE_DIR)/ui/ozone/platform_li st.h',
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 'platform/headless/headless.gypi', 278 'platform/headless/headless.gypi',
278 ], 279 ],
279 }], 280 }],
280 ['<(ozone_platform_wayland) == 1', { 281 ['<(ozone_platform_wayland) == 1', {
281 'includes': [ 282 'includes': [
282 'platform/wayland/wayland.gypi', 283 'platform/wayland/wayland.gypi',
283 ], 284 ],
284 }], 285 }],
285 ], 286 ],
286 } 287 }
OLDNEW
« no previous file with comments | « ui/ozone/common/gpu/ozone_gpu_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698