From ccddd0a9417e5c015f0f4f6a75e1179fe33514d7 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Thu, 19 Sep 2013 20:27:32 +0000 Subject: [PATCH] Roll webrtc's chromium_revision 217707:224141 Also adds -lm for executables depending on isac since the newer clang in the newer chromium revision requires it, and -lstdc++ for dependencies of the objc lib because newer gyp links with gcc instead of g++ for non-C++-containing libs. R=niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2177007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4795 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 2 +- talk/libjingle.gyp | 5 +++++ .../modules/audio_coding/codecs/isac/main/source/isac.gypi | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 5d5984405..0c08ebb70 100644 --- a/DEPS +++ b/DEPS @@ -11,7 +11,7 @@ vars = { "googlecode_url": "http://%s.googlecode.com/svn", "sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code", "chromium_trunk" : "http://src.chromium.org/svn/trunk", - "chromium_revision": "217707", + "chromium_revision": "224141", # A small subset of WebKit is needed for the Android Python test framework. "webkit_trunk": "http://src.chromium.org/blink/trunk", diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index 1d288e309..2caa75692 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -221,6 +221,11 @@ '<(DEPTH)/talk/app/webrtc/objc/public', ], }, + 'all_dependent_settings': { + 'libraries': [ + '-lstdc++', + ], + }, 'include_dirs': [ '<(DEPTH)/talk/app/webrtc', '<(DEPTH)/talk/app/webrtc/objc', diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi b/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi index a9cfa32ea..7825f0952 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi @@ -78,6 +78,11 @@ 'defines': [ 'WEBRTC_LINUX', ], + 'all_dependent_settings': { + 'libraries': [ + '-lm', + ], + }, }], ], },