From 0c6f0f94f1444041b8759d56ee9b6e0c756d1308 Mon Sep 17 00:00:00 2001 From: "mallinath@webrtc.org" Date: Thu, 20 Mar 2014 23:07:03 +0000 Subject: [PATCH] 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 --- talk/libjingle.gyp | 2 -- talk/libjingle_tests.gyp | 4 ---- 2 files changed, 6 deletions(-) diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index e2b7c30f74..73c8a048f6 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -992,7 +992,6 @@ '<(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', @@ -1134,7 +1133,6 @@ '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 2deddd4a26..31dc55171b 100755 --- a/talk/libjingle_tests.gyp +++ b/talk/libjingle_tests.gyp @@ -60,7 +60,6 @@ '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', ], @@ -257,7 +256,6 @@ '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 @@ -332,7 +330,6 @@ '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', @@ -391,7 +388,6 @@ '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': [