Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / webrtc.gyp

diff --git a/src/third_party/webrtc/webrtc.gyp b/src/third_party/webrtc/webrtc.gyp
index d50552d..dee366c 100644 (file)
--- a/src/third_party/webrtc/webrtc.gyp
+++ b/src/third_party/webrtc/webrtc.gyp
@@ -20,9 +20,11 @@
   'variables': {
     'webrtc_all_dependencies': [
       'base/base.gyp:*',
+      'sound/sound.gyp:*',
       'common.gyp:*',
       'common_audio/common_audio.gyp:*',
       'common_video/common_video.gyp:*',
+      'libjingle/xmllite/xmllite.gyp:*',
       'modules/modules.gyp:*',
       'system_wrappers/source/system_wrappers.gyp:*',
       'video_engine/video_engine.gyp:*',
@@ -41,19 +43,16 @@
       'conditions': [
         ['include_tests==1', {
           'dependencies': [
-            'base/base_tests.gyp:*',
             'common_video/common_video_unittests.gyp:*',
+            'libjingle/xmllite/xmllite_tests.gyp:*',
+            'sound/sound_tests.gyp:*',
             'system_wrappers/source/system_wrappers_tests.gyp:*',
             'test/metrics.gyp:*',
             'test/test.gyp:*',
             'test/webrtc_test_common.gyp:webrtc_test_common_unittests',
             'tools/tools.gyp:*',
             'webrtc_tests',
-          ],
-        }],
-        ['build_with_chromium==0 and OS=="android"', {
-          'dependencies': [
-            '../tools/android/android_tools_precompiled.gyp:*',
+            'rtc_unittests',
           ],
         }],
       ],
@@ -79,6 +78,16 @@
         'common.gyp:*',
         '<@(webrtc_video_dependencies)',
       ],
+      'conditions': [
+        # TODO(andresp): Chromium libpeerconnection should link directly with
+       # this and no if conditions should be needed on webrtc build files.
+        ['build_with_chromium==1', {
+         'dependencies': [
+           '<(webrtc_root)/modules/modules.gyp:video_capture_module_impl',
+           '<(webrtc_root)/modules/modules.gyp:video_render_module_impl',
+         ],
+       }],
+      ],
     },
   ],
 }