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
This commit is contained in:
parent
6917e19ad4
commit
ccddd0a941
2
DEPS
2
DEPS
@ -11,7 +11,7 @@ vars = {
|
|||||||
"googlecode_url": "http://%s.googlecode.com/svn",
|
"googlecode_url": "http://%s.googlecode.com/svn",
|
||||||
"sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
|
"sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
|
||||||
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
"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.
|
# A small subset of WebKit is needed for the Android Python test framework.
|
||||||
"webkit_trunk": "http://src.chromium.org/blink/trunk",
|
"webkit_trunk": "http://src.chromium.org/blink/trunk",
|
||||||
|
@ -221,6 +221,11 @@
|
|||||||
'<(DEPTH)/talk/app/webrtc/objc/public',
|
'<(DEPTH)/talk/app/webrtc/objc/public',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
'all_dependent_settings': {
|
||||||
|
'libraries': [
|
||||||
|
'-lstdc++',
|
||||||
|
],
|
||||||
|
},
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'<(DEPTH)/talk/app/webrtc',
|
'<(DEPTH)/talk/app/webrtc',
|
||||||
'<(DEPTH)/talk/app/webrtc/objc',
|
'<(DEPTH)/talk/app/webrtc/objc',
|
||||||
|
@ -78,6 +78,11 @@
|
|||||||
'defines': [
|
'defines': [
|
||||||
'WEBRTC_LINUX',
|
'WEBRTC_LINUX',
|
||||||
],
|
],
|
||||||
|
'all_dependent_settings': {
|
||||||
|
'libraries': [
|
||||||
|
'-lm',
|
||||||
|
],
|
||||||
|
},
|
||||||
}],
|
}],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user