summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/webrtc/build/merge_libs.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/webrtc/build/merge_libs.gyp')
-rw-r--r--chromium/third_party/webrtc/build/merge_libs.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/webrtc/build/merge_libs.gyp b/chromium/third_party/webrtc/build/merge_libs.gyp
index c31b259de1c..4f8cdac85e8 100644
--- a/chromium/third_party/webrtc/build/merge_libs.gyp
+++ b/chromium/third_party/webrtc/build/merge_libs.gyp
@@ -10,7 +10,7 @@
'includes': ['common.gypi',],
'variables': {
'merge_libs_dependencies': [
- '../video_engine/video_engine.gyp:video_engine_core',
+ '../webrtc.gyp:webrtc',
],
},
'targets': [
@@ -31,7 +31,7 @@
'actions': [
{
'variables': {
- 'output_lib_name': 'webrtc',
+ 'output_lib_name': 'webrtc_merged',
'output_lib': '<(PRODUCT_DIR)/<(STATIC_LIB_PREFIX)<(output_lib_name)<(STATIC_LIB_SUFFIX)',
},
'action_name': 'merge_libs',