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 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. | 8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. |
9 }, | 9 }, |
10 'target_defaults': { | 10 'target_defaults': { |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
276 'type': 'static_library', | 276 'type': 'static_library', |
277 'variables': { 'enable_wexit_time_destructors': 1, }, | 277 'variables': { 'enable_wexit_time_destructors': 1, }, |
278 'includes': [ | 278 'includes': [ |
279 'content_ppapi_plugin.gypi', | 279 'content_ppapi_plugin.gypi', |
280 ], | 280 ], |
281 # Disable c4267 warnings until we fix size_t to int truncations. | 281 # Disable c4267 warnings until we fix size_t to int truncations. |
282 'msvs_disabled_warnings': [ 4267, ], | 282 'msvs_disabled_warnings': [ 4267, ], |
283 }, | 283 }, |
284 { | 284 { |
285 # GN version: //content/renderer and //content/public/renderer | 285 # GN version: //content/renderer and //content/public/renderer |
286 'target_name': 'content_renderer', | 286 'target_name': 'content_renderer', |
hbos_chromium
2016/04/21 07:36:09
Nice, but you forgot GN. Make the same changes for
mcasas
2016/04/21 15:09:18
Done. Note that video_track_encoder.* is bundled
i
| |
287 'type': 'static_library', | 287 'type': 'static_library', |
288 'variables': { 'enable_wexit_time_destructors': 1, }, | 288 'variables': { 'enable_wexit_time_destructors': 1, }, |
289 'includes': [ | 289 'includes': [ |
290 'content_renderer.gypi', | 290 'content_renderer.gypi', |
291 '../third_party/webrtc/build/common.gypi', | |
291 ], | 292 ], |
292 'dependencies': [ | 293 'dependencies': [ |
293 '../third_party/webrtc/modules/modules.gyp:webrtc_h264', | |
294 'common_features', | 294 'common_features', |
295 'content_child', | 295 'content_child', |
296 'content_common', | 296 'content_common', |
297 'content_gpu', | 297 'content_gpu', |
298 'content_resources', | 298 'content_resources', |
299 ], | 299 ], |
300 'export_dependent_settings': [ | 300 'export_dependent_settings': [ |
301 'content_common', | 301 'content_common', |
302 ], | 302 ], |
303 'conditions': [ | 303 'conditions': [ |
304 ['chromium_enable_vtune_jit_for_v8==1', { | 304 ['chromium_enable_vtune_jit_for_v8==1', { |
305 'dependencies': [ | 305 'dependencies': [ |
306 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', | 306 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', |
307 ], | 307 ], |
308 }], | 308 }], |
309 ['rtc_use_h264==1', { | |
310 'dependencies': [ | |
311 '../third_party/openh264/openh264.gyp:openh264_encoder', | |
312 '../third_party/webrtc/modules/modules.gyp:webrtc_h264', | |
313 ], | |
314 }], | |
309 ], | 315 ], |
310 }, | 316 }, |
311 { | 317 { |
312 # GN version: //content/utility and //content/public/utility | 318 # GN version: //content/utility and //content/public/utility |
313 'target_name': 'content_utility', | 319 'target_name': 'content_utility', |
314 'type': 'static_library', | 320 'type': 'static_library', |
315 'variables': { 'enable_wexit_time_destructors': 1, }, | 321 'variables': { 'enable_wexit_time_destructors': 1, }, |
316 'includes': [ | 322 'includes': [ |
317 'content_utility.gypi', | 323 'content_utility.gypi', |
318 ], | 324 ], |
319 'dependencies': [ | 325 'dependencies': [ |
320 'content_child', | 326 'content_child', |
321 'content_common', | 327 'content_common', |
322 'content_common_mojo_bindings.gyp:content_common_mojo_bindings', | 328 'content_common_mojo_bindings.gyp:content_common_mojo_bindings', |
323 ], | 329 ], |
324 }, | 330 }, |
325 ], | 331 ], |
326 }, | 332 }, |
327 { # component != static_library | 333 { # component != static_library |
328 'targets': [ | 334 'targets': [ |
329 { | 335 { |
330 # GN version: //content | 336 # GN version: //content |
331 'target_name': 'content', | 337 'target_name': 'content', |
hbos_chromium
2016/04/21 07:36:09
You should make a similar change here, when compon
mcasas
2016/04/21 15:09:18
Done.
| |
332 'type': 'shared_library', | 338 'type': 'shared_library', |
333 'variables': { 'enable_wexit_time_destructors': 1, }, | 339 'variables': { 'enable_wexit_time_destructors': 1, }, |
334 'dependencies': [ | 340 'dependencies': [ |
335 '../third_party/webrtc/modules/modules.gyp:webrtc_h264', | 341 '../third_party/webrtc/modules/modules.gyp:webrtc_h264', |
336 'common_features', | 342 'common_features', |
337 'content_resources', | 343 'content_resources', |
338 ], | 344 ], |
339 'conditions': [ | 345 'conditions': [ |
340 ['chromium_enable_vtune_jit_for_v8==1', { | 346 ['chromium_enable_vtune_jit_for_v8==1', { |
341 'dependencies': [ | 347 'dependencies': [ |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
677 }, | 683 }, |
678 'includes': [ | 684 'includes': [ |
679 '../build/android/copy_ex.gypi', | 685 '../build/android/copy_ex.gypi', |
680 '../build/android/v8_external_startup_data_arch_suffix.gypi', | 686 '../build/android/v8_external_startup_data_arch_suffix.gypi', |
681 ], | 687 ], |
682 }, | 688 }, |
683 ], | 689 ], |
684 }], # OS == "android" | 690 }], # OS == "android" |
685 ], | 691 ], |
686 } | 692 } |
OLD | NEW |