From fd0f267bb1009e42312e7543d49dbb46eb25c337 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Fri, 24 Jan 2014 10:43:47 +0000 Subject: [PATCH] Add new API (webrtc.gyp:webrtc) to merge_libs.gyp. 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 --- webrtc/build/merge_libs.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/build/merge_libs.gyp b/webrtc/build/merge_libs.gyp index c31b259de..739841d39 100644 --- a/webrtc/build/merge_libs.gyp +++ b/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': [