Revert 5737 "Add system wrapper dependency to libjingle targets."
Adding additional dependency is not required for libjingle targets. > Add system wrapper dependency to libjingle targets. > 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 TBR=mallinath@webrtc.org Review URL: https://webrtc-codereview.appspot.com/10379004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5744 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
5e83c65aee
commit
0c6f0f94f1
@ -992,7 +992,6 @@
|
|||||||
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
|
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
|
||||||
'libjingle',
|
'libjingle',
|
||||||
'libjingle_media',
|
'libjingle_media',
|
||||||
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
|
||||||
],
|
],
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'<(DEPTH)/testing/gtest/include',
|
'<(DEPTH)/testing/gtest/include',
|
||||||
@ -1134,7 +1133,6 @@
|
|||||||
'libjingle',
|
'libjingle',
|
||||||
'libjingle_media',
|
'libjingle_media',
|
||||||
'libjingle_p2p',
|
'libjingle_p2p',
|
||||||
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
|
||||||
],
|
],
|
||||||
'sources': [
|
'sources': [
|
||||||
'app/webrtc/audiotrack.cc',
|
'app/webrtc/audiotrack.cc',
|
||||||
|
@ -60,7 +60,6 @@
|
|||||||
'target_name': 'libjingle_unittest_main',
|
'target_name': 'libjingle_unittest_main',
|
||||||
'type': 'static_library',
|
'type': 'static_library',
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'<(DEPTH)/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
|
||||||
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
|
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
|
||||||
'gunit',
|
'gunit',
|
||||||
],
|
],
|
||||||
@ -257,7 +256,6 @@
|
|||||||
'gunit',
|
'gunit',
|
||||||
'libjingle.gyp:libjingle_media',
|
'libjingle.gyp:libjingle_media',
|
||||||
'libjingle_unittest_main',
|
'libjingle_unittest_main',
|
||||||
'<(DEPTH)/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
|
||||||
],
|
],
|
||||||
# TODO(ronghuawu): Avoid the copies.
|
# TODO(ronghuawu): Avoid the copies.
|
||||||
# https://code.google.com/p/libjingle/issues/detail?id=398
|
# https://code.google.com/p/libjingle/issues/detail?id=398
|
||||||
@ -332,7 +330,6 @@
|
|||||||
'libjingle.gyp:libjingle',
|
'libjingle.gyp:libjingle',
|
||||||
'libjingle.gyp:libjingle_p2p',
|
'libjingle.gyp:libjingle_p2p',
|
||||||
'libjingle_unittest_main',
|
'libjingle_unittest_main',
|
||||||
'<(DEPTH)/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
|
||||||
],
|
],
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'<(DEPTH)/third_party/libsrtp/srtp',
|
'<(DEPTH)/third_party/libsrtp/srtp',
|
||||||
@ -391,7 +388,6 @@
|
|||||||
'libjingle.gyp:libjingle_p2p',
|
'libjingle.gyp:libjingle_p2p',
|
||||||
'libjingle.gyp:libjingle_peerconnection',
|
'libjingle.gyp:libjingle_peerconnection',
|
||||||
'libjingle_unittest_main',
|
'libjingle_unittest_main',
|
||||||
'<(DEPTH)/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
|
||||||
],
|
],
|
||||||
# TODO(ronghuawu): Reenable below unit tests that require gmock.
|
# TODO(ronghuawu): Reenable below unit tests that require gmock.
|
||||||
'sources': [
|
'sources': [
|
||||||
|
Loading…
Reference in New Issue
Block a user