Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjingle/libjingle_common.gypi

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | third_party/libjingle/libjingle_nacl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/libjingle_common.gypi
diff --git a/third_party/libjingle/libjingle_common.gypi b/third_party/libjingle/libjingle_common.gypi
index 9f6c880ff6e40e073bb488beba7efe26c0f5ba91..c2bc1bb727a11742a87e6d7b2e9f90b01f7a01c3 100644
--- a/third_party/libjingle/libjingle_common.gypi
+++ b/third_party/libjingle/libjingle_common.gypi
@@ -7,186 +7,6 @@
'nacl_untrusted_build%': 0,
},
'sources': [
- '<(libjingle_source)/talk/base/asyncfile.cc',
- '<(libjingle_source)/talk/base/asyncfile.h',
- '<(libjingle_source)/talk/base/asynchttprequest.cc',
- '<(libjingle_source)/talk/base/asynchttprequest.h',
- '<(libjingle_source)/talk/base/asyncpacketsocket.h',
- '<(libjingle_source)/talk/base/asyncsocket.cc',
- '<(libjingle_source)/talk/base/asyncsocket.h',
- '<(libjingle_source)/talk/base/asynctcpsocket.cc',
- '<(libjingle_source)/talk/base/asynctcpsocket.h',
- '<(libjingle_source)/talk/base/asyncudpsocket.cc',
- '<(libjingle_source)/talk/base/asyncudpsocket.h',
- '<(libjingle_source)/talk/base/autodetectproxy.cc',
- '<(libjingle_source)/talk/base/autodetectproxy.h',
- '<(libjingle_source)/talk/base/base64.cc',
- '<(libjingle_source)/talk/base/base64.h',
- '<(libjingle_source)/talk/base/basicdefs.h',
- '<(libjingle_source)/talk/base/bytebuffer.cc',
- '<(libjingle_source)/talk/base/bytebuffer.h',
- '<(libjingle_source)/talk/base/byteorder.h',
- '<(libjingle_source)/talk/base/checks.cc',
- '<(libjingle_source)/talk/base/checks.h',
- '<(libjingle_source)/talk/base/common.cc',
- '<(libjingle_source)/talk/base/common.h',
- '<(libjingle_source)/talk/base/compile_assert.h',
- '<(libjingle_source)/talk/base/cpumonitor.cc',
- '<(libjingle_source)/talk/base/cpumonitor.h',
- '<(libjingle_source)/talk/base/crc32.cc',
- '<(libjingle_source)/talk/base/crc32.h',
- '<(libjingle_source)/talk/base/criticalsection.h',
- '<(libjingle_source)/talk/base/cryptstring.h',
- '<(libjingle_source)/talk/base/diskcache.cc',
- '<(libjingle_source)/talk/base/diskcache.h',
- '<(libjingle_source)/talk/base/dscp.h',
- '<(libjingle_source)/talk/base/event.cc',
- '<(libjingle_source)/talk/base/event.h',
- '<(libjingle_source)/talk/base/fileutils.cc',
- '<(libjingle_source)/talk/base/fileutils.h',
- '<(libjingle_source)/talk/base/firewallsocketserver.cc',
- '<(libjingle_source)/talk/base/firewallsocketserver.h',
- '<(libjingle_source)/talk/base/flags.cc',
- '<(libjingle_source)/talk/base/flags.h',
- '<(libjingle_source)/talk/base/helpers.cc',
- '<(libjingle_source)/talk/base/helpers.h',
- '<(libjingle_source)/talk/base/httpbase.cc',
- '<(libjingle_source)/talk/base/httpbase.h',
- '<(libjingle_source)/talk/base/httpclient.cc',
- '<(libjingle_source)/talk/base/httpclient.h',
- '<(libjingle_source)/talk/base/httpcommon-inl.h',
- '<(libjingle_source)/talk/base/httpcommon.cc',
- '<(libjingle_source)/talk/base/httpcommon.h',
- '<(libjingle_source)/talk/base/httprequest.cc',
- '<(libjingle_source)/talk/base/httprequest.h',
- '<(libjingle_source)/talk/base/ifaddrs-android.cc',
- '<(libjingle_source)/talk/base/ifaddrs-android.h',
- '<(libjingle_source)/talk/base/ipaddress.cc',
- '<(libjingle_source)/talk/base/ipaddress.h',
- '<(libjingle_source)/talk/base/latebindingsymboltable.cc',
- '<(libjingle_source)/talk/base/latebindingsymboltable.h',
- '<(libjingle_source)/talk/base/linked_ptr.h',
- '<(libjingle_source)/talk/base/linux.cc',
- '<(libjingle_source)/talk/base/linux.h',
- '<(libjingle_source)/talk/base/logging.cc',
- '<(libjingle_source)/talk/base/logging.h',
- '<(libjingle_source)/talk/base/maccocoathreadhelper.h',
- '<(libjingle_source)/talk/base/maccocoathreadhelper.mm',
- '<(libjingle_source)/talk/base/macconversion.cc',
- '<(libjingle_source)/talk/base/macconversion.h',
- '<(libjingle_source)/talk/base/macutils.cc',
- '<(libjingle_source)/talk/base/macutils.h',
- '<(libjingle_source)/talk/base/md5.cc',
- '<(libjingle_source)/talk/base/md5.h',
- '<(libjingle_source)/talk/base/md5digest.h',
- '<(libjingle_source)/talk/base/messagedigest.cc',
- '<(libjingle_source)/talk/base/messagedigest.h',
- '<(libjingle_source)/talk/base/messagehandler.cc',
- '<(libjingle_source)/talk/base/messagehandler.h',
- '<(libjingle_source)/talk/base/messagequeue.cc',
- '<(libjingle_source)/talk/base/messagequeue.h',
- '<(libjingle_source)/talk/base/move.h',
- '<(libjingle_source)/talk/base/nethelpers.cc',
- '<(libjingle_source)/talk/base/nethelpers.h',
- '<(libjingle_source)/talk/base/network.cc',
- '<(libjingle_source)/talk/base/network.h',
- '<(libjingle_source)/talk/base/nssidentity.cc',
- '<(libjingle_source)/talk/base/nssidentity.h',
- '<(libjingle_source)/talk/base/nssstreamadapter.cc',
- '<(libjingle_source)/talk/base/nssstreamadapter.h',
- '<(libjingle_source)/talk/base/nullsocketserver.h',
- '<(libjingle_source)/talk/base/openssladapter.cc',
- '<(libjingle_source)/talk/base/openssldigest.cc',
- '<(libjingle_source)/talk/base/opensslidentity.cc',
- '<(libjingle_source)/talk/base/opensslstreamadapter.cc',
- '<(libjingle_source)/talk/base/pathutils.cc',
- '<(libjingle_source)/talk/base/pathutils.h',
- '<(libjingle_source)/talk/base/physicalsocketserver.cc',
- '<(libjingle_source)/talk/base/physicalsocketserver.h',
- '<(libjingle_source)/talk/base/proxydetect.cc',
- '<(libjingle_source)/talk/base/proxydetect.h',
- '<(libjingle_source)/talk/base/proxyinfo.cc',
- '<(libjingle_source)/talk/base/proxyinfo.h',
- '<(libjingle_source)/talk/base/ratelimiter.cc',
- '<(libjingle_source)/talk/base/ratelimiter.h',
- '<(libjingle_source)/talk/base/ratetracker.cc',
- '<(libjingle_source)/talk/base/ratetracker.h',
- '<(libjingle_source)/talk/base/schanneladapter.cc',
- '<(libjingle_source)/talk/base/schanneladapter.h',
- '<(libjingle_source)/talk/base/scoped_autorelease_pool.h',
- '<(libjingle_source)/talk/base/scoped_autorelease_pool.mm',
- '<(libjingle_source)/talk/base/scoped_ptr.h',
- '<(libjingle_source)/talk/base/sec_buffer.h',
- '<(libjingle_source)/talk/base/sha1.cc',
- '<(libjingle_source)/talk/base/sha1.h',
- '<(libjingle_source)/talk/base/sha1digest.h',
- '<(libjingle_source)/talk/base/signalthread.cc',
- '<(libjingle_source)/talk/base/signalthread.h',
- '<(libjingle_source)/talk/base/sigslot.h',
- '<(libjingle_source)/talk/base/sigslotrepeater.h',
- '<(libjingle_source)/talk/base/socket.h',
- '<(libjingle_source)/talk/base/socketadapters.cc',
- '<(libjingle_source)/talk/base/socketadapters.h',
- '<(libjingle_source)/talk/base/socketaddress.cc',
- '<(libjingle_source)/talk/base/socketaddress.h',
- '<(libjingle_source)/talk/base/socketaddresspair.cc',
- '<(libjingle_source)/talk/base/socketaddresspair.h',
- '<(libjingle_source)/talk/base/socketfactory.h',
- '<(libjingle_source)/talk/base/socketpool.cc',
- '<(libjingle_source)/talk/base/socketpool.h',
- '<(libjingle_source)/talk/base/socketserver.h',
- '<(libjingle_source)/talk/base/socketstream.cc',
- '<(libjingle_source)/talk/base/socketstream.h',
- '<(libjingle_source)/talk/base/ssladapter.cc',
- '<(libjingle_source)/talk/base/ssladapter.h',
- '<(libjingle_source)/talk/base/sslfingerprint.cc',
- '<(libjingle_source)/talk/base/sslfingerprint.h',
- '<(libjingle_source)/talk/base/sslidentity.cc',
- '<(libjingle_source)/talk/base/sslidentity.h',
- '<(libjingle_source)/talk/base/sslsocketfactory.cc',
- '<(libjingle_source)/talk/base/sslsocketfactory.h',
- '<(libjingle_source)/talk/base/sslstreamadapter.cc',
- '<(libjingle_source)/talk/base/sslstreamadapter.h',
- '<(libjingle_source)/talk/base/sslstreamadapterhelper.cc',
- '<(libjingle_source)/talk/base/sslstreamadapterhelper.h',
- '<(libjingle_source)/talk/base/stream.cc',
- '<(libjingle_source)/talk/base/stream.h',
- '<(libjingle_source)/talk/base/stringencode.cc',
- '<(libjingle_source)/talk/base/stringencode.h',
- '<(libjingle_source)/talk/base/stringutils.cc',
- '<(libjingle_source)/talk/base/stringutils.h',
- '<(libjingle_source)/talk/base/systeminfo.cc',
- '<(libjingle_source)/talk/base/systeminfo.h',
- '<(libjingle_source)/talk/base/task.cc',
- '<(libjingle_source)/talk/base/task.h',
- '<(libjingle_source)/talk/base/taskparent.cc',
- '<(libjingle_source)/talk/base/taskparent.h',
- '<(libjingle_source)/talk/base/taskrunner.cc',
- '<(libjingle_source)/talk/base/taskrunner.h',
- '<(libjingle_source)/talk/base/template_util.h',
- '<(libjingle_source)/talk/base/thread.cc',
- '<(libjingle_source)/talk/base/thread.h',
- '<(libjingle_source)/talk/base/timeutils.cc',
- '<(libjingle_source)/talk/base/timeutils.h',
- '<(libjingle_source)/talk/base/timing.cc',
- '<(libjingle_source)/talk/base/timing.h',
- '<(libjingle_source)/talk/base/unixfilesystem.cc',
- '<(libjingle_source)/talk/base/unixfilesystem.h',
- '<(libjingle_source)/talk/base/urlencode.cc',
- '<(libjingle_source)/talk/base/urlencode.h',
- '<(libjingle_source)/talk/base/win32.cc',
- '<(libjingle_source)/talk/base/win32.h',
- '<(libjingle_source)/talk/base/win32filesystem.cc',
- '<(libjingle_source)/talk/base/win32filesystem.h',
- '<(libjingle_source)/talk/base/win32securityerrors.cc',
- '<(libjingle_source)/talk/base/win32window.cc',
- '<(libjingle_source)/talk/base/win32window.h',
- '<(libjingle_source)/talk/base/winfirewall.cc',
- '<(libjingle_source)/talk/base/winfirewall.h',
- '<(libjingle_source)/talk/base/winping.cc',
- '<(libjingle_source)/talk/base/winping.h',
- '<(libjingle_source)/talk/base/worker.cc',
- '<(libjingle_source)/talk/base/worker.h',
'<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.cc',
'<(libjingle_source)/talk/p2p/base/asyncstuntcpsocket.h',
'<(libjingle_source)/talk/p2p/base/basicpacketsocketfactory.cc',
@@ -314,40 +134,16 @@
['exclude', '/unix[a-z]+\\.(h|cc)$'],
],
}],
- ['OS!="linux" or nacl_untrusted_build==1', {
- 'sources!': [
- '<(libjingle_source)/talk/base/latebindingsymboltable.cc',
- '<(libjingle_source)/talk/base/latebindingsymboltable.h',
- ],
- }],
- ['(OS!="linux" and OS!="android") or nacl_untrusted_build==1', {
- 'sources!': [
- '<(libjingle_source)/talk/base/linux.cc',
- '<(libjingle_source)/talk/base/linux.h',
- ],
- }],
['(OS!="mac" and OS!="ios") or nacl_untrusted_build==1', {
'sources/': [
['exclude', '/mac[a-z]+\\.(h|cc)$'],
['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
],
}],
- ['OS!="android" or nacl_untrusted_build==1', {
- 'sources!': [
- '<(libjingle_source)/talk/base/ifaddrs-android.cc',
- '<(libjingle_source)/talk/base/ifaddrs-android.h',
- ],
- }],
['use_openssl!=1', {
'sources/': [
['exclude', '/openssl[a-z]+\\.(h|cc)$'],
],
}],
- ['nacl_untrusted_build==1', {
- 'sources!': [
- '<(libjingle_source)/talk/base/systeminfo.cc',
- '<(libjingle_source)/talk/base/systeminfo.h',
- ],
- }],
],
}
« no previous file with comments | « third_party/libjingle/libjingle.gyp ('k') | third_party/libjingle/libjingle_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698