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

Unified Diff: content/content.gyp

Issue 1715753002: Revert of 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: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/BUILD.gn ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index d5591a41d0f5bdba2542b6eefffd2487835428b2..6b11ac2fd58512e405931a1b6156d4dcd2ddcc83 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -23,8 +23,8 @@
},
'targets': [
{
- # GN version: //content/public/common:common_features
- 'target_name': 'common_features',
+ # GN version: //content/renderer:renderer_features
+ 'target_name': 'renderer_features',
'includes': [
'../build/buildflag_header.gypi',
'../third_party/webrtc/build/common.gypi',
@@ -37,25 +37,12 @@
# TODO(hbos): crbug.com/584219
['1==1', {
'variables': {
- 'buildflag_header_path': 'content/public/common/common_features.h',
+ 'buildflag_header_path': 'content/renderer/renderer_features.h',
'buildflag_flags': [
'RTC_USE_H264=<(rtc_use_h264)',
],
},
}],
- ],
- },
- {
- # GN version: //content/public/common:feature_h264_with_openh264_ffmpeg
- 'target_name': 'feature_h264_with_openh264_ffmpeg',
- 'type': 'static_library',
- 'include_dirs': [ '<@(DEPTH)' ],
- 'deps': [
- ':common_features',
- ],
- 'sources': [
- 'public/common/feature_h264_with_openh264_ffmpeg.cc',
- 'public/common/feature_h264_with_openh264_ffmpeg.h',
],
},
],
@@ -298,10 +285,10 @@
],
'dependencies': [
'../third_party/webrtc/modules/modules.gyp:webrtc_h264',
- 'common_features',
'content_child',
'content_common',
'content_resources',
+ 'renderer_features',
],
'export_dependent_settings': [
'content_common',
@@ -341,8 +328,8 @@
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../third_party/webrtc/modules/modules.gyp:webrtc_h264',
- 'common_features',
'content_resources',
+ 'renderer_features',
],
'conditions': [
['chromium_enable_vtune_jit_for_v8==1', {
« 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