diff options
| author | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 23:50:09 +0000 |
|---|---|---|
| committer | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 23:50:09 +0000 |
| commit | d08baed84e8aed2343a697c6d1627d3b456e3e02 (patch) | |
| tree | 7dd88c7c6b82475919881932340d314a9ef9ed72 /content/BUILD.gn | |
| parent | 504cc9199a69d10a4a2296697afb4736e1b53231 (diff) | |
| download | chromium_src-d08baed84e8aed2343a697c6d1627d3b456e3e02.zip chromium_src-d08baed84e8aed2343a697c6d1627d3b456e3e02.tar.gz chromium_src-d08baed84e8aed2343a697c6d1627d3b456e3e02.tar.bz2 | |
Revert "Update webrtc&libjingle 6774:6799."
This reverts commit bf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a.
(https://codereview.chromium.org/429253003)
Broke sizes on Linux
http://build.chromium.org/p/chromium/builders/Linux/builds/51786
https://code.google.com/p/webrtc/source/browse/trunk/webrtc/base/linux.cc
defines static std::string lsb_release_string; among other things
It's guarded in WEBRTC_CHROMIUM_BUILDs. Maybe it should be
WEBRTC_CHROMIUM_BUILD.
BUG=NONE
TBR=darin@chromium.org, hclam@chromium.org, jochen@chromium.org, palmer@chromium.org, sergeyu@chromium.org, wez@chromium.org, ronghuawu@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/435823002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/BUILD.gn')
| -rw-r--r-- | content/BUILD.gn | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/content/BUILD.gn b/content/BUILD.gn index a2bd489..a49a887 100644 --- a/content/BUILD.gn +++ b/content/BUILD.gn @@ -81,18 +81,17 @@ config("libjingle_stub_config") { ] if (is_mac) { - defines += [ "OSX", "WEBRTC_MAC" ] + defines += [ "OSX" ] } else if (is_linux) { - defines += [ "LINUX", "WEBRTC_LINUX" ] + defines += [ "LINUX" ] } else if (is_android) { - defines += [ "ANDROID", "WEBRTC_LINUX", "WEBRTC_ANDROID" ] + defines += [ "ANDROID" ] } else if (is_win) { libs = [ "secur32.lib", "crypt32.lib", "iphlpapi.lib" ] - defines += [ "WEBRTC_WIN" ] } if (is_posix) { - defines += [ "POSIX", "WEBRTC_POSIX" ] + defines += [ "POSIX" ] } if (is_chromeos) { defines += [ "CHROMEOS" ] |