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

Side by Side Diff: content/content.gyp

Issue 1728453002: Enable H.264 video WebRTC behind run-time flag and add WebRtcBrowserTest for H.264 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: #define macro instead of BUILDFLAG. common_features (aka renderer_features) deleted. Created 4 years, 10 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 | « chrome/test/BUILD.gn ('k') | content/content_common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' , 9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' ,
10 }, 10 },
11 'target_defaults': { 11 'target_defaults': {
12 'defines': ['CONTENT_IMPLEMENTATION'], 12 'defines': ['CONTENT_IMPLEMENTATION'],
13 'conditions': [ 13 'conditions': [
14 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. 14 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed.
15 ['OS=="win" and target_arch=="x64"', { 15 ['OS=="win" and target_arch=="x64"', {
16 'msvs_settings': { 16 'msvs_settings': {
17 'VCCLCompilerTool': { 17 'VCCLCompilerTool': {
18 'AdditionalOptions': ['/bigobj'], 18 'AdditionalOptions': ['/bigobj'],
19 }, 19 },
20 }, 20 },
21 }], 21 }],
22 ], 22 ],
23 }, 23 },
24 'targets': [ 24 'targets': [
25 { 25 {
26 # GN version: //content/renderer:renderer_features 26 # GN version: //content/public/common:feature_h264_with_openh264_ffmpeg
27 'target_name': 'renderer_features', 27 'target_name': 'feature_h264_with_openh264_ffmpeg',
28 'type': 'static_library',
29 'include_dirs': [ '<@(DEPTH)' ],
28 'includes': [ 30 'includes': [
29 '../build/buildflag_header.gypi',
30 '../third_party/webrtc/build/common.gypi', 31 '../third_party/webrtc/build/common.gypi',
31 ], 32 ],
32 'conditions': [ 33 'conditions': [
33 # This conditional looks insane, but without it |rtc_use_h264| is not 34 ['rtc_use_h264==1', {
34 # recognized as defined. Might have something to do with scopes. Moving 35 'defines': [
35 # the inclusion of third_party/webrtc/build/common.gypi to outside of 36 'BUILDFLAG_RTC_USE_H264',
36 # 'targets' is not an option, then we get compile errors. 37 ],
37 # TODO(hbos): crbug.com/584219
38 ['1==1', {
39 'variables': {
40 'buildflag_header_path': 'content/renderer/renderer_features.h',
41 'buildflag_flags': [
42 'RTC_USE_H264=<(rtc_use_h264)',
43 ],
44 },
45 }], 38 }],
46 ], 39 ],
40 'sources': [
41 'public/common/feature_h264_with_openh264_ffmpeg.cc',
42 'public/common/feature_h264_with_openh264_ffmpeg.h',
43 ],
47 }, 44 },
48 ], 45 ],
49 'includes': [ 46 'includes': [
50 '../build/win_precompile.gypi', 47 '../build/win_precompile.gypi',
51 'content_resources.gypi', 48 'content_resources.gypi',
52 ], 49 ],
53 'conditions': [ 50 'conditions': [
54 ['OS == "win"', { 51 ['OS == "win"', {
55 'targets': [ 52 'targets': [
56 { 53 {
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 'type': 'static_library', 258 'type': 'static_library',
262 'variables': { 'enable_wexit_time_destructors': 1, }, 259 'variables': { 'enable_wexit_time_destructors': 1, },
263 'includes': [ 260 'includes': [
264 'content_renderer.gypi', 261 'content_renderer.gypi',
265 ], 262 ],
266 'dependencies': [ 263 'dependencies': [
267 '../third_party/webrtc/modules/modules.gyp:webrtc_h264', 264 '../third_party/webrtc/modules/modules.gyp:webrtc_h264',
268 'content_child', 265 'content_child',
269 'content_common', 266 'content_common',
270 'content_resources', 267 'content_resources',
271 'renderer_features',
272 ], 268 ],
273 'export_dependent_settings': [ 269 'export_dependent_settings': [
274 'content_common', 270 'content_common',
275 ], 271 ],
276 'conditions': [ 272 'conditions': [
277 ['chromium_enable_vtune_jit_for_v8==1', { 273 ['chromium_enable_vtune_jit_for_v8==1', {
278 'dependencies': [ 274 'dependencies': [
279 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', 275 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
280 ], 276 ],
281 }], 277 }],
(...skipping 18 matching lines...) Expand all
300 { # component != static_library 296 { # component != static_library
301 'targets': [ 297 'targets': [
302 { 298 {
303 # GN version: //content 299 # GN version: //content
304 'target_name': 'content', 300 'target_name': 'content',
305 'type': 'shared_library', 301 'type': 'shared_library',
306 'variables': { 'enable_wexit_time_destructors': 1, }, 302 'variables': { 'enable_wexit_time_destructors': 1, },
307 'dependencies': [ 303 'dependencies': [
308 '../third_party/webrtc/modules/modules.gyp:webrtc_h264', 304 '../third_party/webrtc/modules/modules.gyp:webrtc_h264',
309 'content_resources', 305 'content_resources',
310 'renderer_features',
311 ], 306 ],
312 'conditions': [ 307 'conditions': [
313 ['chromium_enable_vtune_jit_for_v8==1', { 308 ['chromium_enable_vtune_jit_for_v8==1', {
314 'dependencies': [ 309 'dependencies': [
315 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', 310 '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
316 ], 311 ],
317 }], 312 }],
318 ], 313 ],
319 'includes': [ 314 'includes': [
320 'content_app.gypi', 315 'content_app.gypi',
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 }, 650 },
656 'includes': [ 651 'includes': [
657 '../build/android/copy_ex.gypi', 652 '../build/android/copy_ex.gypi',
658 '../build/android/v8_external_startup_data_arch_suffix.gypi', 653 '../build/android/v8_external_startup_data_arch_suffix.gypi',
659 ], 654 ],
660 }, 655 },
661 ], 656 ],
662 }], # OS == "android" 657 }], # OS == "android"
663 ], 658 ],
664 } 659 }
OLDNEW
« no previous file with comments | « chrome/test/BUILD.gn ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698