generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add system wrapper dependency to libjingle targets.

Browse Source 
This is necessary to handle usage of STR_CASE_CMP in
common_types.h ( as in https://webrtc-codereview.appspot.com/10099005/)

TBR=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/10309004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5737 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org 2014-03-20 15:09:09 +00:00
parent 8a8c3ef2ae
commit 979f1f8235
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/libjingle.gyp
View File

@ -992,6 +992,7 @@
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
'libjingle',
'libjingle_media',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'<(DEPTH)/testing/gtest/include',
@ -1133,6 +1134,7 @@
'libjingle',
'libjingle_media',
'libjingle_p2p',
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'sources': [
'app/webrtc/audiotrack.cc',

4
talk/libjingle_tests.gyp
View File

@ -60,6 +60,7 @@
'target_name': 'libjingle_unittest_main',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
'gunit',
],
@ -256,6 +257,7 @@
'gunit',
'libjingle.gyp:libjingle_media',
'libjingle_unittest_main',
'<(DEPTH)/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
# TODO(ronghuawu): Avoid the copies.
# https://code.google.com/p/libjingle/issues/detail?id=398
@ -330,6 +332,7 @@
'libjingle.gyp:libjingle',
'libjingle.gyp:libjingle_p2p',
'libjingle_unittest_main',
'<(DEPTH)/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'<(DEPTH)/third_party/libsrtp/srtp',
@ -388,6 +391,7 @@
'libjingle.gyp:libjingle_p2p',
'libjingle.gyp:libjingle_peerconnection',
'libjingle_unittest_main',
'<(DEPTH)/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
# TODO(ronghuawu): Reenable below unit tests that require gmock.
'sources': [