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
This commit is contained in:
parent
e5ea75254f
commit
2d9af90116
@ -659,12 +659,22 @@
|
|||||||
'dependencies': [
|
'dependencies': [
|
||||||
'libjingle_app',
|
'libjingle_app',
|
||||||
'../../testing/gtest.gyp:gtest',
|
'../../testing/gtest.gyp:gtest',
|
||||||
'../../testing/gtest.gyp:gtest_main',
|
'../../testing/gtest.gyp:gtest_main',
|
||||||
'../../src/modules/audio_device/main/source/audio_device.gyp:audio_device',
|
|
||||||
],
|
],
|
||||||
'conditions': [
|
'conditions': [
|
||||||
['peer_connection_dev==1', {
|
['peer_connection_dev==1', {
|
||||||
'type': 'executable',
|
'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': [
|
'sources': [
|
||||||
'<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnection_unittests.cc',
|
'<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnection_unittests.cc',
|
||||||
'<(libjingle_mods)/source/talk/app/webrtc_dev/local_stream_dev_unittest.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/peerconnection_impl_dev_unittest.cc',
|
||||||
'<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnectionmanager_unittest.cc',
|
'<(libjingle_mods)/source/talk/app/webrtc_dev/peerconnectionmanager_unittest.cc',
|
||||||
],
|
],
|
||||||
}, {
|
}, { # peer_connection_dev != 1
|
||||||
'type': 'none',
|
'type': 'none',
|
||||||
} ], # peer_connection_dev
|
} ], # peer_connection_dev
|
||||||
['peer_connection_dev==1 and OS=="linux"', {
|
['peer_connection_dev==1 and OS=="linux"', {
|
||||||
|
Loading…
Reference in New Issue
Block a user