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

Unified Diff: content/content.gyp

Issue 1884383002: VideoTrackRecorder: Adding inner class H264Encoder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hbos@ comments: adding explicit dep to openh264 in content.gyp and content/renderer/BUILD.gn 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/BUILD.gn » ('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 6160fb274f7f2bbf06c3cea73c19ecee5fe68a79..18e65a08977ab4db94a9bb6594e7e2314641eec9 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -288,9 +288,9 @@
'variables': { 'enable_wexit_time_destructors': 1, },
'includes': [
'content_renderer.gypi',
+ '../third_party/webrtc/build/common.gypi',
],
'dependencies': [
- '../third_party/webrtc/modules/modules.gyp:webrtc_h264',
'common_features',
'content_child',
'content_common',
@@ -306,6 +306,12 @@
'../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
],
}],
+ ['rtc_use_h264==1', {
+ 'dependencies': [
+ '../third_party/openh264/openh264.gyp:openh264_encoder',
+ '../third_party/webrtc/modules/modules.gyp:webrtc_h264',
+ ],
+ }],
],
},
{
@@ -332,7 +338,6 @@
'type': 'shared_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
- '../third_party/webrtc/modules/modules.gyp:webrtc_h264',
'common_features',
'content_resources',
],
@@ -342,6 +347,12 @@
'../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
],
}],
+ ['rtc_use_h264==1', {
+ 'dependencies': [
+ '../third_party/openh264/openh264.gyp:openh264_encoder',
+ '../third_party/webrtc/modules/modules.gyp:webrtc_h264',
+ ],
+ }],
],
'includes': [
'content_app.gypi',
@@ -352,6 +363,7 @@
'content_ppapi_plugin.gypi',
'content_renderer.gypi',
'content_utility.gypi',
+ '../third_party/webrtc/build/common.gypi',
],
'msvs_settings': {
'VCLinkerTool': {
« no previous file with comments | « no previous file | content/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698