From 2d9af901167b8cadfd929954479a472f67771944 Mon Sep 17 00:00:00 2001 From: "perkj@webrtc.org" Date: Wed, 7 Sep 2011 08:35:36 +0000 Subject: [PATCH] Fix error when building Peerconnection in Chrome. The error is due to wrong include path. Review URL: http://webrtc-codereview.appspot.com/139016 git-svn-id: http://webrtc.googlecode.com/svn/trunk@543 4adac7df-926f-26a2-2b94-8c16560cd09d --- third_party_mods/libjingle/libjingle.gyp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/third_party_mods/libjingle/libjingle.gyp b/third_party_mods/libjingle/libjingle.gyp index 04af21fd4..b207b066a 100644 --- a/third_party_mods/libjingle/libjingle.gyp +++ b/third_party_mods/libjingle/libjingle.gyp @@ -659,12 +659,22 @@ 'dependencies': [ 'libjingle_app', '../../testing/gtest.gyp:gtest', - '../../testing/gtest.gyp:gtest_main', - '../../src/modules/audio_device/main/source/audio_device.gyp:audio_device', + '../../testing/gtest.gyp:gtest_main', ], 'conditions': [ ['peer_connection_dev==1', { 'type': 'executable', + 'conditions': [ + ['inside_chromium_build==1', { + 'dependencies': [ + '../../third_party/webrtc/modules/audio_device/main/source/audio_device.gyp:audio_device', + ] + }, { + 'dependencies': [ + '../../src/modules/audio_device/main/source/audio_device.gyp:audio_device', + ] + }], + ], #conditions 'sources': [ '<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnection_unittests.cc', '<(libjingle_mods)/source/talk/app/webrtc_dev/local_stream_dev_unittest.cc', @@ -672,7 +682,7 @@ '<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnection_impl_dev_unittest.cc', '<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnectionmanager_unittest.cc', ], - }, { + }, { # peer_connection_dev != 1 'type': 'none', } ], # peer_connection_dev ['peer_connection_dev==1 and OS=="linux"', {