From 979f1f8235bb393a949ca4d6956d1c17dfd5fd77 Mon Sep 17 00:00:00 2001 From: "mallinath@webrtc.org" Date: Thu, 20 Mar 2014 15:09:09 +0000 Subject: [PATCH] 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 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5737 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/libjingle.gyp | 2 ++ talk/libjingle_tests.gyp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index 73c8a048f6..e2b7c30f74 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -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', diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp index 31dc55171b..2deddd4a26 100755 --- a/talk/libjingle_tests.gyp +++ b/talk/libjingle_tests.gyp @@ -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': [