generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add new API (webrtc.gyp:webrtc) to merge_libs.gyp.

Browse Source 
Required to be able to link new API code against the merged target.
Replaces old dependency on video_engine_core as the new-API target
depends on it for now, and video_engine_core is being phased out.

R=mflodman@webrtc.org
BUG=1667

Review URL: https://webrtc-codereview.appspot.com/7519004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5424 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-01-24 10:43:47 +00:00
parent 99a8c7e039
commit fd0f267bb1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/build/merge_libs.gyp
View File

@ -10,7 +10,7 @@
'includes': ['common.gypi',], 'includes': ['common.gypi',],
'variables': { 'variables': {
'merge_libs_dependencies': [ 'merge_libs_dependencies': [
'../video_engine/video_engine.gyp:video_engine_core', '../webrtc.gyp:webrtc',
], ],
}, },
'targets': [ 'targets': [