Merge video_engine_core into webrtc target.

webrtc/video/webrtc_video.gypi

Index: webrtc/video/webrtc_video.gypi
diff --git a/webrtc/video/webrtc_video.gypi b/webrtc/video/webrtc_video.gypi
index 545f284f686d8efc25638e35ce16837eb6dddd65..86c22162a8c10918193e53dd893b843a3b080568 100644
--- a/webrtc/video/webrtc_video.gypi
+++ b/webrtc/video/webrtc_video.gypi
@@ -8,7 +8,18 @@
 {
   'variables': {
     'webrtc_video_dependencies': [
-      '<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core',
+      '<(webrtc_root)/base/base.gyp:rtc_base_approved',
+      '<(webrtc_root)/common.gyp:webrtc_common',
+      '<(webrtc_root)/common_video/common_video.gyp:common_video',
+      '<(webrtc_root)/modules/modules.gyp:bitrate_controller',
+      '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
+      '<(webrtc_root)/modules/modules.gyp:video_capture_module',
+      '<(webrtc_root)/modules/modules.gyp:video_processing',
+      '<(webrtc_root)/modules/modules.gyp:video_render_module',
+      '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
+      '<(webrtc_root)/modules/modules.gyp:webrtc_video_coding',
+      '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
+      '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
     ],
     'webrtc_video_sources': [
       'video/audio_receive_stream.cc',
@@ -16,10 +27,10 @@
       'video/call.cc',
       'video/encoded_frame_callback_adapter.cc',
       'video/encoded_frame_callback_adapter.h',
-      'video/send_statistics_proxy.cc',
-      'video/send_statistics_proxy.h',
       'video/receive_statistics_proxy.cc',
       'video/receive_statistics_proxy.h',
+      'video/send_statistics_proxy.cc',
+      'video/send_statistics_proxy.h',
       'video/transport_adapter.cc',
       'video/transport_adapter.h',
       'video/video_decoder.cc',
@@ -28,6 +39,33 @@
       'video/video_receive_stream.h',
       'video/video_send_stream.cc',
       'video/video_send_stream.h',
+      'video_engine/call_stats.cc',
+      'video_engine/call_stats.h',
+      'video_engine/encoder_state_feedback.cc',
+      'video_engine/encoder_state_feedback.h',
+      'video_engine/overuse_frame_detector.cc',
+      'video_engine/overuse_frame_detector.h',
+      'video_engine/payload_router.cc',
+      'video_engine/payload_router.h',
+      'video_engine/report_block_stats.cc',
+      'video_engine/report_block_stats.h',
+      'video_engine/stream_synchronization.cc',
+      'video_engine/stream_synchronization.h',
+      'video_engine/vie_capturer.cc',
+      'video_engine/vie_capturer.h',
+      'video_engine/vie_channel.cc',
+      'video_engine/vie_channel.h',
+      'video_engine/vie_channel_group.cc',
+      'video_engine/vie_channel_group.h',
+      'video_engine/vie_defines.h',
+      'video_engine/vie_encoder.cc',
+      'video_engine/vie_encoder.h',
+      'video_engine/vie_receiver.cc',
+      'video_engine/vie_receiver.h',
+      'video_engine/vie_remb.cc',
+      'video_engine/vie_remb.h',
+      'video_engine/vie_sync_module.cc',
+      'video_engine/vie_sync_module.h',
     ],
   },
 }