| 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': {
|
|
|