OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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, # Use higher warning level. | 7 'chromium_code': 1, # Use higher warning level. |
8 }, | 8 }, |
9 'target_defaults': { | 9 'target_defaults': { |
10 'conditions': [ | 10 'conditions': [ |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 '../base/base.gyp:base', | 46 '../base/base.gyp:base', |
47 '../base/base.gyp:base_i18n', | 47 '../base/base.gyp:base_i18n', |
48 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 48 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
49 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', | 49 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', |
50 '../gpu/gpu.gyp:command_buffer_client', | 50 '../gpu/gpu.gyp:command_buffer_client', |
51 '../gpu/gpu.gyp:gles2_implementation', | 51 '../gpu/gpu.gyp:gles2_implementation', |
52 '../ipc/ipc.gyp:ipc', | 52 '../ipc/ipc.gyp:ipc', |
53 '../media/media.gyp:shared_memory_support', | 53 '../media/media.gyp:shared_memory_support', |
54 '../skia/skia.gyp:skia', | 54 '../skia/skia.gyp:skia', |
55 '../third_party/icu/icu.gyp:icuuc', | 55 '../third_party/icu/icu.gyp:icuuc', |
| 56 '../ui/gfx/gfx.gyp:gfx_geometry', |
56 '../ui/surface/surface.gyp:surface', | 57 '../ui/surface/surface.gyp:surface', |
57 '../url/url.gyp:url_lib', | 58 '../url/url.gyp:url_lib', |
58 'ppapi.gyp:ppapi_c', | 59 'ppapi.gyp:ppapi_c', |
59 ], | 60 ], |
60 'export_dependent_settings': [ | 61 'export_dependent_settings': [ |
61 '../base/base.gyp:base', | 62 '../base/base.gyp:base', |
62 ], | 63 ], |
63 'conditions': [ | 64 'conditions': [ |
64 ['OS=="mac"', { | 65 ['OS=="mac"', { |
65 'link_settings': { | 66 'link_settings': { |
(...skipping 14 matching lines...) Expand all Loading... |
80 'target_name': 'ppapi_ipc', | 81 'target_name': 'ppapi_ipc', |
81 'type': 'static_library', | 82 'type': 'static_library', |
82 'variables': { | 83 'variables': { |
83 'ppapi_ipc_target': 1, | 84 'ppapi_ipc_target': 1, |
84 }, | 85 }, |
85 'dependencies': [ | 86 'dependencies': [ |
86 '../base/base.gyp:base', | 87 '../base/base.gyp:base', |
87 '../gpu/gpu.gyp:command_buffer_traits', | 88 '../gpu/gpu.gyp:command_buffer_traits', |
88 '../ipc/ipc.gyp:ipc', | 89 '../ipc/ipc.gyp:ipc', |
89 '../skia/skia.gyp:skia', | 90 '../skia/skia.gyp:skia', |
| 91 '../ui/gfx/ipc/geometry/gfx_ipc_geometry.gyp:gfx_ipc_geometry', |
90 'ppapi.gyp:ppapi_c', | 92 'ppapi.gyp:ppapi_c', |
91 'ppapi_shared', | 93 'ppapi_shared', |
92 ], | 94 ], |
93 'all_dependent_settings': { | 95 'all_dependent_settings': { |
94 'include_dirs': [ | 96 'include_dirs': [ |
95 '..', | 97 '..', |
96 ], | 98 ], |
97 }, | 99 }, |
98 }, | 100 }, |
99 { | 101 { |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', | 163 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', |
162 '../gpu/gpu.gyp:gles2_implementation', | 164 '../gpu/gpu.gyp:gles2_implementation', |
163 '../gpu/gpu.gyp:command_buffer_traits', | 165 '../gpu/gpu.gyp:command_buffer_traits', |
164 '../media/media.gyp:shared_memory_support', | 166 '../media/media.gyp:shared_memory_support', |
165 '../mojo/mojo_edk.gyp:mojo_system_impl', | 167 '../mojo/mojo_edk.gyp:mojo_system_impl', |
166 '../ipc/ipc.gyp:ipc', | 168 '../ipc/ipc.gyp:ipc', |
167 '../skia/skia.gyp:skia', | 169 '../skia/skia.gyp:skia', |
168 '../third_party/icu/icu.gyp:icuuc', | 170 '../third_party/icu/icu.gyp:icuuc', |
169 '../third_party/icu/icu.gyp:icui18n', | 171 '../third_party/icu/icu.gyp:icui18n', |
170 '../ui/gfx/gfx.gyp:gfx_geometry', | 172 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 173 '../ui/gfx/ipc/geometry/gfx_ipc_geometry.gyp:gfx_ipc_geometry', |
171 '../ui/surface/surface.gyp:surface', | 174 '../ui/surface/surface.gyp:surface', |
172 'ppapi.gyp:ppapi_c', | 175 'ppapi.gyp:ppapi_c', |
173 'ppapi_shared', | 176 'ppapi_shared', |
174 ], | 177 ], |
175 'all_dependent_settings': { | 178 'all_dependent_settings': { |
176 'include_dirs': [ | 179 'include_dirs': [ |
177 '..', | 180 '..', |
178 ], | 181 ], |
179 }, | 182 }, |
180 'conditions': [ | 183 'conditions': [ |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 'variables': { | 217 'variables': { |
215 'nacl_win64_target': 1, | 218 'nacl_win64_target': 1, |
216 'ppapi_shared_target': 1, | 219 'ppapi_shared_target': 1, |
217 }, | 220 }, |
218 'dependencies': [ | 221 'dependencies': [ |
219 'ppapi.gyp:ppapi_c', | 222 'ppapi.gyp:ppapi_c', |
220 '../base/base.gyp:base_win64', | 223 '../base/base.gyp:base_win64', |
221 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations_win64', | 224 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn
amic_annotations_win64', |
222 '../gpu/gpu.gyp:command_buffer_common_win64', | 225 '../gpu/gpu.gyp:command_buffer_common_win64', |
223 '../ipc/ipc.gyp:ipc_win64', | 226 '../ipc/ipc.gyp:ipc_win64', |
| 227 '../ui/gfx/gfx.gyp:gfx_geometry_win64', |
224 ], | 228 ], |
225 'defines': [ | 229 'defines': [ |
226 '<@(nacl_win64_defines)', | 230 '<@(nacl_win64_defines)', |
227 ], | 231 ], |
228 'export_dependent_settings': [ | 232 'export_dependent_settings': [ |
229 '../base/base.gyp:base_win64', | 233 '../base/base.gyp:base_win64', |
230 ], | 234 ], |
231 'configurations': { | 235 'configurations': { |
232 'Common_Base': { | 236 'Common_Base': { |
233 'msvs_target_platform': 'x64', | 237 'msvs_target_platform': 'x64', |
234 }, | 238 }, |
235 }, | 239 }, |
236 }, | 240 }, |
237 { | 241 { |
238 # GN version: //ppapi:ppapi_ipc | 242 # GN version: //ppapi:ppapi_ipc |
239 # (Should be automagical when compiling in the 64-bit toolchain.) | 243 # (Should be automagical when compiling in the 64-bit toolchain.) |
240 'target_name': 'ppapi_ipc_win64', | 244 'target_name': 'ppapi_ipc_win64', |
241 'type': 'static_library', | 245 'type': 'static_library', |
242 'variables': { | 246 'variables': { |
243 'nacl_win64_target': 1, | 247 'nacl_win64_target': 1, |
244 'ppapi_ipc_target': 1, | 248 'ppapi_ipc_target': 1, |
245 }, | 249 }, |
246 'dependencies': [ | 250 'dependencies': [ |
247 '../base/base.gyp:base_win64', | 251 '../base/base.gyp:base_win64', |
248 '../ipc/ipc.gyp:ipc_win64', | 252 '../ipc/ipc.gyp:ipc_win64', |
249 '../gpu/gpu.gyp:command_buffer_traits_win64', | 253 '../gpu/gpu.gyp:command_buffer_traits_win64', |
| 254 '../ui/gfx/gfx.gyp:gfx_geometry_win64', |
| 255 '../ui/gfx/ipc/geometry/gfx_ipc_geometry.gyp:gfx_ipc_geometry_win64'
, |
250 'ppapi.gyp:ppapi_c', | 256 'ppapi.gyp:ppapi_c', |
251 'ppapi_shared_win64', | 257 'ppapi_shared_win64', |
252 ], | 258 ], |
253 'export_dependent_settings': [ | 259 'export_dependent_settings': [ |
254 '../gpu/gpu.gyp:command_buffer_traits_win64', | 260 '../gpu/gpu.gyp:command_buffer_traits_win64', |
255 ], | 261 ], |
256 'defines': [ | 262 'defines': [ |
257 '<@(nacl_win64_defines)', | 263 '<@(nacl_win64_defines)', |
258 ], | 264 ], |
259 'all_dependent_settings': { | 265 'all_dependent_settings': { |
260 'include_dirs': [ | 266 'include_dirs': [ |
261 '..', | 267 '..', |
262 ], | 268 ], |
263 }, | 269 }, |
264 'configurations': { | 270 'configurations': { |
265 'Common_Base': { | 271 'Common_Base': { |
266 'msvs_target_platform': 'x64', | 272 'msvs_target_platform': 'x64', |
267 }, | 273 }, |
268 }, | 274 }, |
269 }], | 275 }], |
270 }], | 276 }], |
271 ], | 277 ], |
272 } | 278 } |
OLD | NEW |