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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/base/base.gyp

Issue 1856323003: Revert of Cleanup webrtc/base/base.gyp (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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 | « webrtc/base/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/base.gyp
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index a330be81313947c46f50d98e22fcb403b7db392e..334c1bdfb3936def758f2d69b0ef87a6cfe71aad 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -9,7 +9,7 @@
{
'includes': [ '../build/common.gypi', ],
'conditions': [
- ['os_posix==1 and OS!="mac" and OS!="ios"', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios"', {
'conditions': [
['sysroot!=""', {
'variables': {
@@ -100,6 +100,8 @@
'event_tracer.h',
'exp_filter.cc',
'exp_filter.h',
+ 'logging.cc',
+ 'logging.h',
'md5.cc',
'md5.h',
'md5digest.cc',
@@ -150,8 +152,7 @@
'../../webrtc_overrides/webrtc/base/logging.cc',
'../../webrtc_overrides/webrtc/base/logging.h',
],
- }, {
- 'sources': [
+ 'sources!': [
'logging.cc',
'logging.h',
],
@@ -193,20 +194,29 @@
'asyncudpsocket.h',
'autodetectproxy.cc',
'autodetectproxy.h',
+ 'bandwidthsmoother.cc',
+ 'bandwidthsmoother.h',
'base64.cc',
'base64.h',
+ 'bind.h',
+ 'callback.h',
'common.cc',
'common.h',
'crc32.cc',
'crc32.h',
'cryptstring.cc',
'cryptstring.h',
+ 'dbus.cc',
+ 'dbus.h',
'diskcache.cc',
'diskcache.h',
+ 'diskcache_win32.cc',
+ 'diskcache_win32.h',
'filerotatingstream.cc',
'filerotatingstream.h',
'fileutils.cc',
'fileutils.h',
+ 'fileutils_mock.h',
'firewallsocketserver.cc',
'firewallsocketserver.h',
'flags.cc',
@@ -224,16 +234,58 @@
'httpcommon.h',
'httprequest.cc',
'httprequest.h',
+ 'httpserver.cc',
+ 'httpserver.h',
+ 'ifaddrs-android.cc',
+ 'ifaddrs-android.h',
+ 'ifaddrs_converter.cc',
+ 'ifaddrs_converter.h',
+ 'macifaddrs_converter.cc',
'iosfilesystem.mm',
'ipaddress.cc',
'ipaddress.h',
+ 'json.cc',
+ 'json.h',
+ 'latebindingsymboltable.cc',
+ 'latebindingsymboltable.h',
+ 'libdbusglibsymboltable.cc',
+ 'libdbusglibsymboltable.h',
+ 'linux.cc',
+ 'linux.h',
+ 'linuxfdwalk.c',
+ 'linuxfdwalk.h',
'linked_ptr.h',
+ 'logsinks.cc',
+ 'logsinks.h',
+ 'macasyncsocket.cc',
+ 'macasyncsocket.h',
+ 'maccocoasocketserver.h',
+ 'maccocoasocketserver.mm',
+ 'maccocoathreadhelper.h',
+ 'maccocoathreadhelper.mm',
+ 'macconversion.cc',
+ 'macconversion.h',
+ 'macsocketserver.cc',
+ 'macsocketserver.h',
+ 'macutils.cc',
+ 'macutils.h',
+ 'macwindowpicker.cc',
+ 'macwindowpicker.h',
+ 'mathutils.h',
'messagedigest.cc',
'messagedigest.h',
'messagehandler.cc',
'messagehandler.h',
'messagequeue.cc',
'messagequeue.h',
+ 'multipart.cc',
+ 'multipart.h',
+ 'natserver.cc',
+ 'natserver.h',
+ 'natsocketfactory.cc',
+ 'natsocketfactory.h',
+ 'nattypes.cc',
+ 'nattypes.h',
'nethelpers.cc',
'nethelpers.h',
'network.cc',
@@ -250,18 +302,32 @@
'opensslidentity.h',
'opensslstreamadapter.cc',
'opensslstreamadapter.h',
+ 'optionsfile.cc',
+ 'optionsfile.h',
'pathutils.cc',
'pathutils.h',
'physicalsocketserver.cc',
'physicalsocketserver.h',
+ 'posix.cc',
+ 'posix.h',
+ 'profiler.cc',
+ 'profiler.h',
'proxydetect.cc',
'proxydetect.h',
'proxyinfo.cc',
'proxyinfo.h',
+ 'proxyserver.cc',
+ 'proxyserver.h',
'ratelimiter.cc',
'ratelimiter.h',
+ 'referencecountedsingletonfactory.h',
+ 'rollingaccumulator.h',
'rtccertificate.cc',
'rtccertificate.h',
+ 'scoped_autorelease_pool.h',
+ 'scoped_autorelease_pool.mm',
+ 'scopedptrcollection.h',
+ 'sec_buffer.h',
'sha1.cc',
'sha1.h',
'sha1digest.cc',
@@ -288,10 +354,12 @@
'socketstream.h',
'ssladapter.cc',
'ssladapter.h',
+ 'sslconfig.h',
'sslfingerprint.cc',
'sslfingerprint.h',
'sslidentity.cc',
'sslidentity.h',
+ 'sslroots.h',
'sslsocketfactory.cc',
'sslsocketfactory.h',
'sslstreamadapter.cc',
@@ -304,14 +372,48 @@
'taskparent.h',
'taskrunner.cc',
'taskrunner.h',
+ 'testclient.cc',
+ 'testclient.h',
'thread.cc',
'thread.h',
'timing.cc',
'timing.h',
+ 'transformadapter.cc',
+ 'transformadapter.h',
+ 'unixfilesystem.cc',
+ 'unixfilesystem.h',
'urlencode.cc',
'urlencode.h',
+ 'versionparsing.cc',
+ 'versionparsing.h',
+ 'virtualsocketserver.cc',
+ 'virtualsocketserver.h',
+ 'win32.cc',
+ 'win32.h',
+ 'win32filesystem.cc',
+ 'win32filesystem.h',
+ 'win32regkey.cc',
+ 'win32regkey.h',
+ 'win32securityerrors.cc',
+ 'win32socketinit.cc',
+ 'win32socketinit.h',
+ 'win32socketserver.cc',
+ 'win32socketserver.h',
+ 'win32window.cc',
+ 'win32window.h',
+ 'win32windowpicker.cc',
+ 'win32windowpicker.h',
+ 'window.h',
+ 'windowpicker.h',
+ 'windowpickerfactory.h',
+ 'winfirewall.cc',
+ 'winfirewall.h',
+ 'winping.cc',
+ 'winping.h',
'worker.cc',
'worker.h',
+ 'x11windowpicker.cc',
+ 'x11windowpicker.h',
],
# TODO(henrike): issue 3307, make rtc_base build without disabling
# these flags.
@@ -345,29 +447,41 @@
'sources': [
'../../webrtc_overrides/webrtc/base/win32socketinit.cc',
],
- 'defines': [
- 'NO_MAIN_THREAD_WRAPPING',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'NO_MAIN_THREAD_WRAPPING',
- ],
- },
- }, {
- 'sources': [
+ 'sources!': [
'bandwidthsmoother.cc',
'bandwidthsmoother.h',
'bind.h',
- 'bind.h.pump',
'callback.h',
- 'callback.h.pump',
+ 'dbus.cc',
+ 'dbus.h',
+ 'diskcache_win32.cc',
+ 'diskcache_win32.h',
'fileutils_mock.h',
+ 'genericslot.h',
'httpserver.cc',
'httpserver.h',
'json.cc',
'json.h',
+ 'latebindingsymboltable.cc',
+ 'latebindingsymboltable.h',
+ 'libdbusglibsymboltable.cc',
+ 'libdbusglibsymboltable.h',
+ 'linuxfdwalk.c',
+ 'linuxfdwalk.h',
+ 'x11windowpicker.cc',
+ 'x11windowpicker.h',
+ 'logging.cc',
+ 'logging.h',
'logsinks.cc',
'logsinks.h',
+ 'macasyncsocket.cc',
+ 'macasyncsocket.h',
+ 'maccocoasocketserver.h',
+ 'maccocoasocketserver.mm',
+ 'macsocketserver.cc',
+ 'macsocketserver.h',
+ 'macwindowpicker.cc',
+ 'macwindowpicker.h',
'mathutils.h',
'multipart.cc',
'multipart.h',
@@ -379,12 +493,16 @@
'nattypes.h',
'optionsfile.cc',
'optionsfile.h',
+ 'posix.cc',
+ 'posix.h',
'profiler.cc',
'profiler.h',
'proxyserver.cc',
'proxyserver.h',
'referencecountedsingletonfactory.h',
'rollingaccumulator.h',
+ 'safe_conversions.h',
+ 'safe_conversions_impl.h',
'scopedptrcollection.h',
'sec_buffer.h',
'sslconfig.h',
@@ -398,10 +516,25 @@
'versionparsing.h',
'virtualsocketserver.cc',
'virtualsocketserver.h',
+ 'win32regkey.cc',
+ 'win32regkey.h',
+ 'win32socketinit.cc',
+ 'win32socketinit.h',
+ 'win32socketserver.cc',
+ 'win32socketserver.h',
'window.h',
+ 'windowpickerfactory.h',
'windowpicker.h',
- 'windowpickerfactory.h',
- ],
+ ],
+ 'defines': [
+ 'NO_MAIN_THREAD_WRAPPING',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'NO_MAIN_THREAD_WRAPPING',
+ ],
+ },
+ }, {
'conditions': [
['build_json==1', {
'dependencies': [
@@ -418,50 +551,6 @@
'WEBRTC_EXTERNAL_JSON',
],
}],
- ['OS=="linux"', {
- 'sources': [
- 'dbus.cc',
- 'dbus.h',
- 'libdbusglibsymboltable.cc',
- 'libdbusglibsymboltable.h',
- 'linuxfdwalk.c',
- 'linuxfdwalk.h',
- ],
- }],
- ['os_posix==1', {
- 'sources': [
- 'latebindingsymboltable.cc',
- 'latebindingsymboltable.cc.def',
- 'latebindingsymboltable.h',
- 'latebindingsymboltable.h.def',
- 'posix.cc',
- 'posix.h',
- ],
- }],
- ['OS=="mac"', {
- 'sources': [
- 'macasyncsocket.cc',
- 'macasyncsocket.h',
- 'maccocoasocketserver.h',
- 'maccocoasocketserver.mm',
- 'macsocketserver.cc',
- 'macsocketserver.h',
- 'macwindowpicker.cc',
- 'macwindowpicker.h',
- ],
- }],
- ['OS=="win"', {
- 'sources': [
- 'diskcache_win32.cc',
- 'diskcache_win32.h',
- 'win32regkey.cc',
- 'win32regkey.h',
- 'win32socketinit.cc',
- 'win32socketinit.h',
- 'win32socketserver.cc',
- 'win32socketserver.h',
- ],
- }],
['OS=="win" and clang==1', {
'msvs_settings': {
'VCCLCompilerTool': {
@@ -474,32 +563,25 @@
},
},
}],
- ], # conditions
- }], # build_with_chromium==0
- ['OS=="android"', {
- 'sources': [
- 'ifaddrs-android.cc',
- 'ifaddrs-android.h',
- ],
+ ],
+ }],
+ ['OS == "android"', {
'link_settings': {
'libraries': [
'-llog',
'-lGLESv2',
],
},
- }],
- ['OS=="mac" or OS=="ios"', {
- 'sources': [
- 'maccocoathreadhelper.h',
- 'maccocoathreadhelper.mm',
- 'macconversion.cc',
- 'macconversion.h',
- 'macifaddrs_converter.cc',
- 'scoped_autorelease_pool.h',
- 'scoped_autorelease_pool.mm',
+ }, {
+ 'sources!': [
+ 'ifaddrs-android.cc',
+ 'ifaddrs-android.h',
],
}],
['OS=="ios"', {
+ 'sources/': [
+ ['include', 'macconversion.*'],
+ ],
'all_dependent_settings': {
'xcode_settings': {
'OTHER_LDFLAGS': [
@@ -512,11 +594,7 @@
},
},
}],
- ['use_x11==1', {
- 'sources': [
- 'x11windowpicker.cc',
- 'x11windowpicker.h',
- ],
+ ['use_x11 == 1', {
'link_settings': {
'libraries': [
'-ldl',
@@ -527,6 +605,11 @@
'-lXrender',
],
},
+ }, {
+ 'sources!': [
+ 'x11windowpicker.cc',
+ 'x11windowpicker.h',
+ ],
}],
['OS=="linux"', {
'link_settings': {
@@ -535,12 +618,16 @@
'-lrt',
],
},
+ }, {
+ 'sources!': [
+ 'dbus.cc',
+ 'dbus.h',
+ 'libdbusglibsymboltable.cc',
+ 'libdbusglibsymboltable.h',
+ 'linuxfdwalk.c',
+ ],
}],
['OS=="mac"', {
- 'sources': [
- 'macutils.cc',
- 'macutils.h',
- ],
'all_dependent_settings': {
'link_settings': {
'xcode_settings': {
@@ -567,22 +654,25 @@
},
}],
],
+ }, {
+ 'sources!': [
+ 'macasyncsocket.cc',
+ 'macasyncsocket.h',
+ 'maccocoasocketserver.h',
+ 'maccocoasocketserver.mm',
+ 'macconversion.cc',
+ 'macconversion.h',
+ 'macsocketserver.cc',
+ 'macsocketserver.h',
+ 'macutils.cc',
+ 'macutils.h',
+ 'macwindowpicker.cc',
+ 'macwindowpicker.h',
+ ],
}],
['OS=="win"', {
- 'sources': [
- 'win32.cc',
- 'win32.h',
- 'win32filesystem.cc',
- 'win32filesystem.h',
- 'win32securityerrors.cc',
- 'win32window.cc',
- 'win32window.h',
- 'win32windowpicker.cc',
- 'win32windowpicker.h',
- 'winfirewall.cc',
- 'winfirewall.h',
- 'winping.cc',
- 'winping.h',
+ 'sources!': [
+ 'ifaddrs_converter.cc',
],
'link_settings': {
'libraries': [
@@ -596,14 +686,27 @@
'defines': [
'_CRT_NONSTDC_NO_DEPRECATE',
],
- }],
- ['os_posix==1', {
- 'sources': [
- 'ifaddrs_converter.cc',
- 'ifaddrs_converter.h',
+ }, {
+ 'sources/': [
+ ['exclude', 'win32[a-z0-9]*\\.(h|cc)$'],
+ ],
+ 'sources!': [
+ 'winping.cc',
+ 'winping.h',
+ 'winfirewall.cc',
+ 'winfirewall.h',
+ ],
+ }],
+ ['os_posix==0', {
+ 'sources!': [
+ 'latebindingsymboltable.cc',
+ 'latebindingsymboltable.h',
+ 'posix.cc',
+ 'posix.h',
'unixfilesystem.cc',
'unixfilesystem.h',
],
+ }, {
'configurations': {
'Debug_Base': {
'defines': [
@@ -620,8 +723,14 @@
'CARBON_DEPRECATED=YES',
],
}],
- ['OS=="linux" or OS=="android"', {
- 'sources': [
+ ['OS!="ios" and OS!="mac"', {
+ 'sources!': [
+ 'macifaddrs_converter.cc',
+ 'scoped_autorelease_pool.mm',
+ ],
+ }],
+ ['OS!="linux" and OS!="android"', {
+ 'sources!': [
'linux.cc',
'linux.h',
],
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698