680 lines
18 KiB
Plaintext
Raw Normal View History

# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
{
'includes': [ '../build/common.gypi', ],
'conditions': [
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
['os_posix==1 and OS!="mac" and OS!="ios"', {
'conditions': [
['sysroot!=""', {
'variables': {
'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
},
}, {
'variables': {
'pkg-config': 'pkg-config'
},
}],
],
}],
],
'targets': [
{
# The subset of rtc_base approved for use outside of libjingle.
'target_name': 'rtc_base_approved',
'type': 'static_library',
'sources': [
'array_view.h',
'atomicops.h',
'bind.h',
'bitbuffer.cc',
'bitbuffer.h',
'buffer.h',
'bufferqueue.cc',
'bufferqueue.h',
'bytebuffer.cc',
'bytebuffer.h',
'byteorder.h',
'checks.cc',
'checks.h',
'constructormagic.h',
'copyonwritebuffer.cc',
'copyonwritebuffer.h',
'criticalsection.cc',
'criticalsection.h',
'deprecation.h',
'event.cc',
'event.h',
'event_tracer.cc',
'event_tracer.h',
'exp_filter.cc',
'exp_filter.h',
'file.cc',
'file.h',
'format_macros.h',
'location.h',
'location.cc',
'md5.cc',
'md5.h',
'md5digest.cc',
'md5digest.h',
'mod_ops.h',
'onetimeevent.h',
'optional.h',
'platform_file.cc',
'platform_file.h',
'platform_thread.cc',
'platform_thread.h',
'platform_thread_types.h',
'race_checker.cc',
'race_checker.h',
'random.cc',
'random.h',
'rate_statistics.cc',
'rate_statistics.h',
'rate_limiter.cc',
'rate_limiter.h',
'ratetracker.cc',
'ratetracker.h',
'refcount.h',
Revert of Safe numeric library: base/numerics (copied from Chromium) (patchset #11 id:250001 of https://codereview.webrtc.org/1753293002/ ) Reason for revert: Looks like the Chrome iOS build is broken because of these two changes. So I'm going to have to revert. Here's the error: https://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ninja/builds/185624/steps/compile/logs/stdio FAILED: rm -f arch/libsafe_numerics.arm64.a && ./gyp-mac-tool filter-libtool libtool -static -o arch/libsafe_numerics.arm64.a error: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool: no files specified Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -static [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-sacLT] [-no_warning_for_no_symbols] Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -dynamic [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-o output] [-install_name name] [-compatibility_version #] [-current_version #] [-seg1addr 0x#] [-segs_read_only_addr 0x#] [-segs_read_write_addr 0x#] [-seg_addr_table <filename>] [-seg_addr_table_filename <file_system_path>] [-all_load] [-noall_load] FAILED: rm -f arch/libsafe_numerics.armv7.a && ./gyp-mac-tool filter-libtool libtool -static -o arch/libsafe_numerics.armv7.a error: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool: no files specified Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -static [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-sacLT] [-no_warning_for_no_symbols] Usage: /Applications/Xcode7.0.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/libtool -dynamic [-] file [...] [-filelist listfile[,dirname]] [-arch_only arch] [-o output] [-install_name name] [-compatibility_version #] [-current_version #] [-seg1addr 0x#] [-segs_read_only_addr 0x#] [-segs_read_write_addr 0x#] [-seg_addr_table <filename>] [-seg_addr_table_filename <file_system_path>] [-all_load] [-noall_load] ninja: build stopped: subcommand failed. Original issue's description: > Safe numeric library added: base/numerics (copied from Chromium) > > This copies the contents (unittest excluded) of base/numerics in > chromium to base/numerics in webrtc. Files added: > - safe_conversions.h > - safe_conversions_impl.h > - safe_math.h > - safe_math_impl.h > > A really old version of safe_conversions[_impl].h previously existed in > base/, this has been deleted and sources using it have been updated > to include the new base/numerics/safe_converions.h. > > This CL also adds a DEPS file to webrtc/base. > > NOPRESUBMIT=True > BUG=webrtc:5548, webrtc:5623 > > Committed: https://crrev.com/de1c81b2d2196be611674aa6019b9db3a9329042 > Cr-Commit-Position: refs/heads/master@{#11907} TBR=kjellander@webrtc.org,kwiberg@webrtc.org,tina.legrand@webrtc.org,hbos@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5548, webrtc:5623 Review URL: https://codereview.webrtc.org/1792613002 . Cr-Commit-Position: refs/heads/master@{#11965}
2016-03-11 17:12:32 -08:00
'safe_conversions.h',
'safe_conversions_impl.h',
'sanitizer.h',
'scoped_ref_ptr.h',
'stringencode.cc',
'stringencode.h',
'stringutils.cc',
'stringutils.h',
'swap_queue.h',
'systeminfo.cc',
'systeminfo.h',
'template_util.h',
'thread_annotations.h',
'thread_checker.h',
'thread_checker_impl.cc',
'thread_checker_impl.h',
'timestampaligner.cc',
'timestampaligner.h',
'timeutils.cc',
'timeutils.h',
'trace_event.h',
'type_traits.h',
],
'conditions': [
['os_posix==1', {
'sources': [
'file_posix.cc',
],
}],
['OS=="win"', {
'sources': [
'file_win.cc',
],
}],
['build_with_chromium==1', {
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
],
'include_dirs': [
'../../webrtc_overrides',
],
'sources': [
'../../webrtc_overrides/webrtc/base/logging.cc',
'../../webrtc_overrides/webrtc/base/logging.h',
],
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
}, {
'sources': [
'logging.cc',
'logging.h',
'logging_mac.mm',
],
}],
['OS=="mac" and build_with_chromium==0', {
'all_dependent_settings': {
'xcode_settings': {
'OTHER_LDFLAGS': [
# needed for logging_mac.mm
'-framework Foundation',
],
},
},
}], # OS=="mac" and build_with_chromium==0
['OS=="android"', {
'link_settings': {
'libraries': [
'-llog',
],
},
}],
],
},
{
'target_name': 'rtc_task_queue',
'type': 'static_library',
'dependencies': [
'rtc_base_approved',
],
'sources': [
'sequenced_task_checker.h',
'sequenced_task_checker_impl.cc',
'sequenced_task_checker_impl.h',
],
'conditions': [
['build_with_chromium==1', {
'include_dirs': [
'../../webrtc_overrides'
],
'sources' : [
'../../webrtc_overrides/webrtc/base/task_queue.cc',
'../../webrtc_overrides/webrtc/base/task_queue.h',
]
} , {
# If not build for chromium, use our own implementation.
'sources' : [
'task_queue.h',
'task_queue_posix.h',
],
'conditions': [
['build_libevent==1', {
'dependencies': [
'<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
],
}],
['enable_libevent==1', {
'sources': [
'task_queue_libevent.cc',
'task_queue_posix.cc',
],
'defines': [ 'WEBRTC_BUILD_LIBEVENT' ],
'all_dependent_settings': {
'defines': [ 'WEBRTC_BUILD_LIBEVENT' ]
},
}, {
# If not libevent, fall back to the other task queues.
'conditions': [
['OS=="mac" or OS=="ios"', {
'sources': [
'task_queue_gcd.cc',
'task_queue_posix.cc',
],
}],
['OS=="win"', {
'sources': [ 'task_queue_win.cc' ],
}]
],
}],
]
}],
],
},
{
'target_name': 'rtc_base',
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common.gyp:webrtc_common',
'rtc_base_approved',
],
'export_dependent_settings': [
'rtc_base_approved',
],
'defines': [
'FEATURE_ENABLE_SSL',
'SSL_USE_OPENSSL',
'HAVE_OPENSSL_SSL_H',
'LOGGING=1',
],
'sources': [
Reland of move all reference to carbon api (patchset #1 id:1 of https://codereview.webrtc.org/2317343003/ ) Reason for revert: Build issues have now _really_ been fixed Original issue's description: > Revert of move all reference to carbon api (patchset #2 id:300001 of https://codereview.webrtc.org/2321493002/ ) > > Reason for revert: > Still breaks Chromium mac compile: > [4542/22193] CXX obj/third_party/webrtc/base/rtc_base/unixfilesystem.o > FAILED: obj/third_party/webrtc/base/rtc_base/unixfilesystem.o > /b/c/cipd/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/third_party/webrtc/base/rtc_base/unixfilesystem.o.d -DLOGGING=1 -DV8_DEPRECATION_WARNINGS -DENABLE_NOTIFICATIONS -DENABLE_PEPPER_CDMS -DENABLE_PLUGINS=1 -DENABLE_PDF=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DUSE_BROWSER_SPELLCHECKER=1 -DDCHECK_ALWAYS_ON=1 -DNO_TCMALLOC -DUSE_EXTERNAL_POPUP_MENU=1 -DENABLE_WEBRTC=1 -DENABLE_EXTENSIONS=1 -DENABLE_TASK_MANAGER=1 -DENABLE_THEMES=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DUSE_PROPRIETARY_CODECS -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -DCR_CLANG_REVISION=280106-1 -DCR_XCODE_VERSION=0511 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DWEBRTC_RESTRICT_LOGGING -DEXPAT_RELATIVE_PATH -DENABLE_EXTERNAL_AUTH -DHAVE_OPENSSL_SSL_H -DHAVE_SCTP -DHAVE_SRTP -DHAVE_WEBRTC_VIDEO -DHAVE_WEBRTC_VOICE -DLOGGING_INSIDE_WEBRTC -DSRTP_RELATIVE_PATH -DSSL_USE_OPENSSL -DUSE_WEBRTC_DEV_BRANCH -DSSL_USE_OPENSSL -DHAVE_OPENSSL_SSL_H -DFEATURE_ENABLE_SSL -DLOGGING=1 -DFEATURE_ENABLE_SSL -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_POSIX -DWEBRTC_MAC -DNO_MAIN_THREAD_WRAPPING -I../../third_party/webrtc_overrides -I../../third_party/boringssl/src/include -I../.. -Igen -I../../third_party/jsoncpp/overrides/include -I../../third_party/jsoncpp/source/include -I../../third_party/webrtc_overrides -I../../third_party -I../../third_party/boringssl/src/include -Wno-uninitialized -fno-strict-aliasing -fstack-protector -fcolor-diagnostics -arch x86_64 -O2 -g1 -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -mmacosx-version-min=10.7 -fvisibility=hidden -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Wheader-hygiene -Wstring-conversion -Werror -Wall -Wno-unused-variable -Wpartial-availability -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default -Wno-deprecated-register -Wno-unneeded-internal-declaration -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wno-undefined-var-template -Wno-nonportable-include-path -Wno-address-of-packed-member -fno-threadsafe-statics -fvisibility-inlines-hidden -std=c++11 -stdlib=libc++ -fno-rtti -fno-exceptions -c ../../third_party/webrtc/base/unixfilesystem.cc -o obj/third_party/webrtc/base/rtc_base/unixfilesystem.o > ../../third_party/webrtc/base/unixfilesystem.cc:375:11: error: variable has incomplete type 'FSRef' > FSRef fr; > ^ > /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFURL.h:467:8: note: forward declaration of 'FSRef' > struct FSRef; > ^ > ../../third_party/webrtc/base/unixfilesystem.cc:376:27: error: use of undeclared identifier 'kUserDomain' > if (0 != FSFindFolder(kUserDomain, kApplicationSupportFolderType, > ^ > ../../third_party/webrtc/base/unixfilesystem.cc:376:40: error: use of undeclared identifier 'kApplicationSupportFolderType' > if (0 != FSFindFolder(kUserDomain, kApplicationSupportFolderType, > ^ > ../../third_party/webrtc/base/unixfilesystem.cc:377:27: error: use of undeclared identifier 'kCreateFolder'; did you mean 'CreateFolder'? > kCreateFolder, &fr)) > ^~~~~~~~~~~~~ > CreateFolder > ../../third_party/webrtc/base/unixfilesystem.cc:92:22: note: 'CreateFolder' declared here > bool UnixFilesystem::CreateFolder(const Pathname &path, mode_t mode) { > > Original issue's description: > > Reland of move all reference to carbon api (patchset #1 id:1 of https://codereview.webrtc.org/2316563002/ ) > > > > Reason for revert: > > Chromium build issues have been resolved. > > > > Original issue's description: > > > Revert of Remove all reference to carbon api (patchset #2 id:20001 of https://codereview.webrtc.org/2299633002/ ) > > > > > > Reason for revert: > > > Breaks chromium build > > > > > > Original issue's description: > > > > Remove all reference to carbon api > > > > > > > > BUG=webrtc:6282 > > > > > > > > Committed: https://crrev.com/dbd8b6bec4143c940b2f2ca8cd85c25d17327964 > > > > Cr-Commit-Position: refs/heads/master@{#14080} > > > > > > TBR=magjed@webrtc.org,mflodman@webrtc.org > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > NOPRESUBMIT=true > > > NOTREECHECKS=true > > > NOTRY=true > > > BUG=webrtc:6282 > > > > > > Committed: https://crrev.com/b096aa7fd375a980daab3a986596548ca5de2a1c > > > Cr-Commit-Position: refs/heads/master@{#14081} > > > > TBR=magjed@webrtc.org,mflodman@webrtc.org > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > BUG=webrtc:6282 > > > > Committed: https://crrev.com/a90879b64fd8db57c0274169311d6b51dd59f1a0 > > Cr-Commit-Position: refs/heads/master@{#14125} > > TBR=mflodman@webrtc.org,kthelgason@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6282 > > Committed: https://crrev.com/4e0581f543b026cbc31c3b24cf65c7f51dcd6124 > Cr-Commit-Position: refs/heads/master@{#14133} TBR=mflodman@webrtc.org,magjed@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6282 Review-Url: https://codereview.webrtc.org/2327573002 Cr-Commit-Position: refs/heads/master@{#14155}
2016-09-09 03:19:48 -07:00
'applefilesystem.mm',
'arraysize.h',
'asyncfile.cc',
'asyncfile.h',
'asyncinvoker.cc',
'asyncinvoker.h',
'asyncinvoker-inl.h',
'asyncpacketsocket.cc',
'asyncpacketsocket.h',
'asyncresolverinterface.cc',
'asyncresolverinterface.h',
'asyncsocket.cc',
'asyncsocket.h',
'asynctcpsocket.cc',
'asynctcpsocket.h',
'asyncudpsocket.cc',
'asyncudpsocket.h',
'autodetectproxy.cc',
'autodetectproxy.h',
'base64.cc',
'base64.h',
'common.cc',
'common.h',
'crc32.cc',
'crc32.h',
'cryptstring.cc',
'cryptstring.h',
'diskcache.cc',
'diskcache.h',
'filerotatingstream.cc',
'filerotatingstream.h',
'fileutils.cc',
'fileutils.h',
'firewallsocketserver.cc',
'firewallsocketserver.h',
'flags.cc',
'flags.h',
'gunit_prod.h',
'helpers.cc',
'helpers.h',
'httpbase.cc',
'httpbase.h',
'httpclient.cc',
'httpclient.h',
'httpcommon-inl.h',
'httpcommon.cc',
'httpcommon.h',
'httprequest.cc',
'httprequest.h',
'ipaddress.cc',
'ipaddress.h',
'linked_ptr.h',
'messagedigest.cc',
'messagedigest.h',
'messagehandler.cc',
'messagehandler.h',
'messagequeue.cc',
'messagequeue.h',
'nethelpers.cc',
'nethelpers.h',
'network.cc',
'network.h',
'networkmonitor.cc',
'networkmonitor.h',
'nullsocketserver.cc',
'nullsocketserver.h',
'openssl.h',
'openssladapter.cc',
'openssladapter.h',
'openssldigest.cc',
'openssldigest.h',
'opensslidentity.cc',
'opensslidentity.h',
'opensslstreamadapter.cc',
'opensslstreamadapter.h',
'pathutils.cc',
'pathutils.h',
'physicalsocketserver.cc',
'physicalsocketserver.h',
'proxydetect.cc',
'proxydetect.h',
'proxyinfo.cc',
'proxyinfo.h',
'ratelimiter.cc',
'ratelimiter.h',
'rtccertificate.cc',
'rtccertificate.h',
'rtccertificategenerator.cc',
'rtccertificategenerator.h',
'sha1.cc',
'sha1.h',
'sha1digest.cc',
'sha1digest.h',
'sharedexclusivelock.cc',
'sharedexclusivelock.h',
'signalthread.cc',
'signalthread.h',
'sigslot.cc',
'sigslot.h',
'sigslotrepeater.h',
'socket.h',
'socketadapters.cc',
'socketadapters.h',
'socketaddress.cc',
'socketaddress.h',
'socketaddresspair.cc',
'socketaddresspair.h',
'socketfactory.h',
'socketpool.cc',
'socketpool.h',
'socketserver.h',
'socketstream.cc',
'socketstream.h',
'ssladapter.cc',
'ssladapter.h',
'sslfingerprint.cc',
'sslfingerprint.h',
'sslidentity.cc',
'sslidentity.h',
'sslsocketfactory.cc',
'sslsocketfactory.h',
'sslstreamadapter.cc',
'sslstreamadapter.h',
'stream.cc',
'stream.h',
'task.cc',
'task.h',
'taskparent.cc',
'taskparent.h',
'taskrunner.cc',
'taskrunner.h',
'thread.cc',
'thread.h',
'timing.cc',
'timing.h',
'urlencode.cc',
'urlencode.h',
'worker.cc',
'worker.h',
],
# TODO(henrike): issue 3307, make rtc_base build without disabling
# these flags.
'cflags!': [
'-Wextra',
'-Wall',
],
'direct_dependent_settings': {
'defines': [
'FEATURE_ENABLE_SSL',
'SSL_USE_OPENSSL',
'HAVE_OPENSSL_SSL_H',
],
},
'include_dirs': [
'../../third_party/jsoncpp/overrides/include',
'../../third_party/jsoncpp/source/include',
],
'conditions': [
['build_with_chromium==1', {
'include_dirs': [
'../../webrtc_overrides',
'../../boringssl/src/include',
],
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
'conditions': [
['OS=="win"', {
'sources': [
'../../webrtc_overrides/webrtc/base/win32socketinit.cc',
],
}],
],
'defines': [
'NO_MAIN_THREAD_WRAPPING',
],
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
'direct_dependent_settings': {
'defines': [
'NO_MAIN_THREAD_WRAPPING',
],
},
}, {
'sources': [
'bandwidthsmoother.cc',
'bandwidthsmoother.h',
'callback.h',
'fileutils_mock.h',
'httpserver.cc',
'httpserver.h',
'json.cc',
'json.h',
'logsinks.cc',
'logsinks.h',
'mathutils.h',
'multipart.cc',
'multipart.h',
'natserver.cc',
'natserver.h',
'natsocketfactory.cc',
'natsocketfactory.h',
'nattypes.cc',
'nattypes.h',
'optionsfile.cc',
'optionsfile.h',
'profiler.cc',
'profiler.h',
'proxyserver.cc',
'proxyserver.h',
'referencecountedsingletonfactory.h',
'rollingaccumulator.h',
'scopedptrcollection.h',
'sec_buffer.h',
'sslconfig.h',
'sslroots.h',
'testbase64.h',
'testclient.cc',
'testclient.h',
'transformadapter.cc',
'transformadapter.h',
'versionparsing.cc',
'versionparsing.h',
'virtualsocketserver.cc',
'virtualsocketserver.h',
'window.h',
Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) Reason for revert: For some odd reason this breaks chromium.webrtc.fyi bots: ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" #error "Only compile this on Windows" ^ 1 error generated. https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio Original issue's description: > Cleanup webrtc/base/base.gyp > > * Remove all source exclusions since they make the file very hard to > read and heavily increases the risk for mistakes. > * Don't compile the openssl* sources if use_openssl==0. > * Move platform specific sources into conditional includes to make it > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > automatic detection of platform specific sources based on filenames). > * Add missing sources for the GN build. > * Reorder some blocks to make GYP vs GN mapping match. > > BUG=webrtc:4256 > R=perkj@webrtc.org, torbjorng@webrtc.org > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > Cr-Commit-Position: refs/heads/master@{#12235} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:4256 NOTRY=True Review URL: https://codereview.webrtc.org/1856323003 Cr-Commit-Position: refs/heads/master@{#12237}
2016-04-05 05:23:26 -07:00
'windowpicker.h',
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
'windowpickerfactory.h',
],
'conditions': [
['build_json==1', {
'dependencies': [
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
],
}, {
'include_dirs': [
'<(json_root)',
],
'defines': [
# When defined changes the include path for json.h to where it
# is expected to be when building json outside of the standalone
# build.
'WEBRTC_EXTERNAL_JSON',
],
}],
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
['OS=="linux"', {
'sources': [
'dbus.cc',
'dbus.h',
'libdbusglibsymboltable.cc',
'libdbusglibsymboltable.h',
'linuxfdwalk.c',
'linuxfdwalk.h',
],
}],
['os_posix==1', {
'sources': [
'latebindingsymboltable.cc',
'latebindingsymboltable.h',
'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': {
'AdditionalOptions': [
# Disable warnings failing when compiling with Clang on Windows.
# https://bugs.chromium.org/p/webrtc/issues/detail?id=5366
'-Wno-sign-compare',
'-Wno-missing-braces',
],
},
},
}],
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
], # conditions
}], # build_with_chromium==0
['OS=="android"', {
'sources': [
'ifaddrs-android.cc',
'ifaddrs-android.h',
],
'link_settings': {
'libraries': [
'-llog',
'-lGLESv2',
],
},
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
}],
['(OS=="mac" or OS=="ios") and nacl_untrusted_build==0', {
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
'sources': [
'maccocoathreadhelper.h',
'maccocoathreadhelper.mm',
'macconversion.cc',
'macconversion.h',
'macifaddrs_converter.cc',
'scoped_autorelease_pool.h',
'scoped_autorelease_pool.mm',
],
}],
['OS=="ios"', {
'all_dependent_settings': {
'xcode_settings': {
'OTHER_LDFLAGS': [
'-framework CFNetwork',
'-framework Foundation',
'-framework Security',
'-framework SystemConfiguration',
'-framework UIKit',
],
},
},
}],
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
['use_x11==1', {
'sources': [
'x11windowpicker.cc',
'x11windowpicker.h',
],
'link_settings': {
'libraries': [
'-ldl',
'-lrt',
'-lXext',
'-lX11',
'-lXcomposite',
'-lXrender',
],
},
}],
['OS=="linux"', {
'link_settings': {
'libraries': [
'-ldl',
'-lrt',
],
},
}],
['OS=="mac"', {
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
'sources': [
'macutils.cc',
'macutils.h',
],
'all_dependent_settings': {
'link_settings': {
'xcode_settings': {
'OTHER_LDFLAGS': [
'-framework Cocoa',
'-framework Foundation',
'-framework IOKit',
'-framework Security',
'-framework SystemConfiguration',
],
},
},
},
}],
['OS=="win" and nacl_untrusted_build==0', {
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
'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',
],
'link_settings': {
'libraries': [
'-lcrypt32.lib',
'-liphlpapi.lib',
'-lsecur32.lib',
],
},
# Suppress warnings about WIN32_LEAN_AND_MEAN.
'msvs_disabled_warnings': [4005, 4703],
'defines': [
'_CRT_NONSTDC_NO_DEPRECATE',
],
}],
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
['os_posix==1', {
'sources': [
'ifaddrs_converter.cc',
'ifaddrs_converter.h',
'unixfilesystem.cc',
'unixfilesystem.h',
],
'configurations': {
'Debug_Base': {
'defines': [
# Chromium's build/common.gypi defines this for all posix
# _except_ for ios & mac. We want it there as well, e.g.
# because ASSERT and friends trigger off of it.
'_DEBUG',
],
},
}
}],
Reland of Cleanup webrtc/base/base.gyp (patchset #1 id:1 of https://codereview.webrtc.org/1856323003/ ) Reason for revert: Creating template CL for reland Original issue's description: > Revert of Cleanup webrtc/base/base.gyp (patchset #2 id:80001 of https://codereview.webrtc.org/1859803002/ ) > > Reason for revert: > For some odd reason this breaks chromium.webrtc.fyi bots: > ../../third_party/webrtc_overrides/webrtc/base/win32socketinit.cc:13:2: error: "Only compile this on Windows" > #error "Only compile this on Windows" > ^ > 1 error generated. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/11515/steps/compile/logs/stdio > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/4650/steps/compile/logs/stdio > > Original issue's description: > > Cleanup webrtc/base/base.gyp > > > > * Remove all source exclusions since they make the file very hard to > > read and heavily increases the risk for mistakes. > > * Don't compile the openssl* sources if use_openssl==0. > > * Move platform specific sources into conditional includes to make it > > easier to verify a 1:1 mapping with BUILD.gn (since GN doesn't support > > automatic detection of platform specific sources based on filenames). > > * Add missing sources for the GN build. > > * Reorder some blocks to make GYP vs GN mapping match. > > > > BUG=webrtc:4256 > > R=perkj@webrtc.org, torbjorng@webrtc.org > > > > Committed: https://crrev.com/47f33cb28ffb0fa0f053ae0aa0086e11f85bf444 > > Cr-Commit-Position: refs/heads/master@{#12235} > > TBR=perkj@webrtc.org,torbjorng@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:4256 > NOTRY=True > > Committed: https://crrev.com/c8587ad92d394bfb60498df1209a3beb9017e001 > Cr-Commit-Position: refs/heads/master@{#12237} TBR=perkj@webrtc.org,torbjorng@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4256 Review URL: https://codereview.webrtc.org/1857163003 Cr-Commit-Position: refs/heads/master@{#12242}
2016-04-05 08:13:31 -07:00
['OS=="linux" or OS=="android"', {
'sources': [
'linux.cc',
'linux.h',
],
}],
['build_ssl==1', {
'dependencies': [
'<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
],
}, {
'include_dirs': [
'<(ssl_root)',
],
}],
],
},
{
'target_name': 'gtest_prod',
'type': 'static_library',
'sources': [
'gtest_prod_util.h',
],
},
],
}