2014-06-17 08:54:03 +00:00
|
|
|
# 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.
|
|
|
|
|
|
|
|
|
|
import("//build/config/crypto.gni")
|
2014-08-15 14:44:13 +00:00
|
|
|
import("//build/config/ui.gni")
|
2014-06-17 08:54:03 +00:00
|
|
|
import("../build/webrtc.gni")
|
|
|
|
|
|
2015-11-23 17:23:44 -08:00
|
|
|
import("//build_overrides/webrtc.gni")
|
|
|
|
|
|
2016-04-24 23:03:07 -07:00
|
|
|
config("rtc_base_approved_all_dependent_config") {
|
|
|
|
|
if (is_mac && !build_with_chromium) {
|
|
|
|
|
libs = [ "Foundation.framework" ] # needed for logging_mac.mm
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-21 20:22:33 +00:00
|
|
|
config("rtc_base_config") {
|
2014-06-17 08:54:03 +00:00
|
|
|
include_dirs = [
|
|
|
|
|
"//third_party/jsoncpp/overrides/include",
|
|
|
|
|
"//third_party/jsoncpp/source/include",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
defines = [
|
|
|
|
|
"FEATURE_ENABLE_SSL",
|
2014-09-02 11:22:06 +00:00
|
|
|
"LOGGING=1",
|
2014-06-17 08:54:03 +00:00
|
|
|
]
|
|
|
|
|
|
2015-04-22 08:49:52 +02:00
|
|
|
if (is_posix) {
|
|
|
|
|
# TODO(henrike): issue 3307, make rtc_base build without disabling
|
|
|
|
|
# these flags.
|
|
|
|
|
cflags_cc = [ "-Wno-non-virtual-dtor" ]
|
|
|
|
|
}
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
|
|
|
|
|
2015-01-21 20:22:33 +00:00
|
|
|
config("rtc_base_chromium_config") {
|
2015-05-25 12:55:39 +02:00
|
|
|
defines = [ "NO_MAIN_THREAD_WRAPPING" ]
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
config("openssl_config") {
|
|
|
|
|
defines = [
|
|
|
|
|
"SSL_USE_OPENSSL",
|
|
|
|
|
"HAVE_OPENSSL_SSL_H",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-25 00:01:36 -07:00
|
|
|
config("rtc_base_all_dependent_config") {
|
|
|
|
|
if (is_ios) {
|
|
|
|
|
libs = [
|
|
|
|
|
"CFNetwork.framework",
|
|
|
|
|
|
|
|
|
|
#"Foundation.framework", # Already in //build/config:default_libs.
|
|
|
|
|
"Security.framework",
|
|
|
|
|
"SystemConfiguration.framework",
|
|
|
|
|
"UIKit.framework", # Already in //build/config:default_libs.
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
if (is_mac) {
|
|
|
|
|
libs = [
|
|
|
|
|
"Cocoa.framework",
|
|
|
|
|
"Foundation.framework",
|
|
|
|
|
"IOKit.framework",
|
|
|
|
|
"Security.framework",
|
|
|
|
|
"SystemConfiguration.framework",
|
|
|
|
|
]
|
|
|
|
|
if (current_cpu == "x86") {
|
|
|
|
|
libs = [ "Carbon.framework" ] # Already in //build/config:default_libs.
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
|
|
|
|
|
2014-08-18 17:56:28 +00:00
|
|
|
if (is_linux && !build_with_chromium) {
|
|
|
|
|
# Provides the same functionality as the //crypto:platform target, which
|
|
|
|
|
# WebRTC cannot use as we don't sync src/crypto from Chromium.
|
|
|
|
|
group("linux_system_ssl") {
|
2016-04-18 11:13:11 -07:00
|
|
|
deps = [
|
|
|
|
|
"//third_party/boringssl",
|
|
|
|
|
]
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-07 17:36:10 +00:00
|
|
|
if (rtc_build_ssl == 0) {
|
2014-09-02 11:22:06 +00:00
|
|
|
config("external_ssl_library") {
|
2014-09-07 17:36:10 +00:00
|
|
|
assert(rtc_ssl_root != "",
|
|
|
|
|
"You must specify rtc_ssl_root when rtc_build_ssl==0.")
|
|
|
|
|
include_dirs = [ rtc_ssl_root ]
|
2014-09-02 11:22:06 +00:00
|
|
|
}
|
|
|
|
|
}
|
2014-08-18 17:56:28 +00:00
|
|
|
|
2014-09-16 01:03:29 +00:00
|
|
|
# The subset of rtc_base approved for use outside of libjingle.
|
|
|
|
|
static_library("rtc_base_approved") {
|
2015-11-25 21:36:14 +01:00
|
|
|
deps = []
|
2014-09-16 01:03:29 +00:00
|
|
|
configs += [ "..:common_config" ]
|
2014-09-28 17:37:22 +00:00
|
|
|
public_configs = [ "..:common_inherited_config" ]
|
2016-04-24 23:03:07 -07:00
|
|
|
all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ]
|
2014-09-16 01:03:29 +00:00
|
|
|
|
|
|
|
|
sources = [
|
2015-10-26 19:51:29 +01:00
|
|
|
"array_view.h",
|
2015-04-30 14:16:07 +02:00
|
|
|
"atomicops.h",
|
2016-04-22 19:34:59 +02:00
|
|
|
"bind.h",
|
2015-04-22 15:43:08 -07:00
|
|
|
"bitbuffer.cc",
|
|
|
|
|
"bitbuffer.h",
|
rtc::Buffer improvements
1. Constructors, SetData(), and AppendData() now accept uint8_t*,
int8_t*, and char*. Previously, they accepted void*, meaning that
any kind of pointer was accepted. I think requiring an explicit
cast in cases where the input array isn't already of a byte-sized
type is a better compromise between convenience and safety.
2. data() can now return a uint8_t* instead of a char*, which seems
more appropriate for a byte array, and is harder to mix up with
zero-terminated C strings. data<int8_t>() is also available so
that callers that want that type instead won't have to cast, as
is data<char>() (which remains the default until all existing
callers have been fixed).
3. Constructors, SetData(), and AppendData() now accept arrays
natively, not just decayed to pointers. The advantage of this is
that callers don't have to pass the size separately.
4. There are new constructors that allow setting size and capacity
without initializing the array. Previously, this had to be done
separately after construction.
5. Instead of TransferTo(), Buffer now supports swap(), and move
construction and assignment, and has a Pass() method that works
just like std::move(). (The Pass method is modeled after
scoped_ptr::Pass().)
R=jmarusic@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/42989004
Cr-Commit-Position: refs/heads/master@{#9033}
2015-04-20 14:03:07 +02:00
|
|
|
"buffer.h",
|
2015-05-21 17:52:01 +02:00
|
|
|
"bufferqueue.cc",
|
|
|
|
|
"bufferqueue.h",
|
2015-04-22 15:43:08 -07:00
|
|
|
"bytebuffer.cc",
|
|
|
|
|
"bytebuffer.h",
|
|
|
|
|
"byteorder.h",
|
2014-09-16 01:03:29 +00:00
|
|
|
"checks.cc",
|
|
|
|
|
"checks.h",
|
2015-11-26 12:54:24 +01:00
|
|
|
"constructormagic.h",
|
2016-03-19 11:36:18 -07:00
|
|
|
"copyonwritebuffer.cc",
|
|
|
|
|
"copyonwritebuffer.h",
|
2015-04-27 17:39:23 +02:00
|
|
|
"criticalsection.cc",
|
|
|
|
|
"criticalsection.h",
|
2015-12-16 01:09:16 -08:00
|
|
|
"deprecation.h",
|
2015-02-09 10:23:27 +00:00
|
|
|
"event.cc",
|
|
|
|
|
"event.h",
|
2015-03-17 14:25:37 +00:00
|
|
|
"event_tracer.cc",
|
|
|
|
|
"event_tracer.h",
|
2014-09-16 01:03:29 +00:00
|
|
|
"exp_filter.cc",
|
|
|
|
|
"exp_filter.h",
|
|
|
|
|
"md5.cc",
|
|
|
|
|
"md5.h",
|
2015-03-09 22:21:53 +00:00
|
|
|
"md5digest.cc",
|
2014-09-16 01:03:29 +00:00
|
|
|
"md5digest.h",
|
2016-04-05 08:13:31 -07:00
|
|
|
"mod_ops.h",
|
2016-04-07 15:36:45 -07:00
|
|
|
"onetimeevent.h",
|
2015-11-10 22:34:18 +01:00
|
|
|
"optional.h",
|
2014-10-10 08:36:56 +00:00
|
|
|
"platform_file.cc",
|
|
|
|
|
"platform_file.h",
|
2015-05-18 09:51:42 +02:00
|
|
|
"platform_thread.cc",
|
|
|
|
|
"platform_thread.h",
|
2015-11-23 14:47:56 -08:00
|
|
|
"platform_thread_types.h",
|
2015-12-10 01:50:55 -08:00
|
|
|
"random.cc",
|
|
|
|
|
"random.h",
|
2016-02-23 22:49:42 -08:00
|
|
|
"rate_statistics.cc",
|
|
|
|
|
"rate_statistics.h",
|
2016-04-05 08:13:31 -07:00
|
|
|
"ratetracker.cc",
|
|
|
|
|
"ratetracker.h",
|
2016-02-14 08:11:10 -08:00
|
|
|
"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",
|
2015-08-19 10:51:18 +02:00
|
|
|
"scoped_ptr.h",
|
2016-02-14 08:11:10 -08:00
|
|
|
"scoped_ref_ptr.h",
|
2014-09-16 01:03:29 +00:00
|
|
|
"stringencode.cc",
|
|
|
|
|
"stringencode.h",
|
|
|
|
|
"stringutils.cc",
|
|
|
|
|
"stringutils.h",
|
2016-03-24 01:51:52 -07:00
|
|
|
"swap_queue.h",
|
2015-08-20 05:04:09 -07:00
|
|
|
"systeminfo.cc",
|
|
|
|
|
"systeminfo.h",
|
2015-01-13 20:32:04 +00:00
|
|
|
"template_util.h",
|
2014-09-24 06:05:00 +00:00
|
|
|
"thread_annotations.h",
|
2015-01-26 15:27:29 +00:00
|
|
|
"thread_checker.h",
|
|
|
|
|
"thread_checker_impl.cc",
|
|
|
|
|
"thread_checker_impl.h",
|
2014-09-16 01:03:29 +00:00
|
|
|
"timeutils.cc",
|
|
|
|
|
"timeutils.h",
|
2015-03-17 14:25:37 +00:00
|
|
|
"trace_event.h",
|
2014-09-16 01:03:29 +00:00
|
|
|
]
|
2015-04-22 15:43:08 -07:00
|
|
|
|
2015-11-25 21:36:14 +01:00
|
|
|
if (build_with_chromium) {
|
|
|
|
|
# Dependency on chromium's logging (in //base).
|
|
|
|
|
deps += [ "//base:base" ]
|
|
|
|
|
sources += [
|
|
|
|
|
"../../webrtc_overrides/webrtc/base/logging.cc",
|
|
|
|
|
"../../webrtc_overrides/webrtc/base/logging.h",
|
|
|
|
|
]
|
|
|
|
|
include_dirs = [ "../../webrtc_overrides" ]
|
|
|
|
|
} else {
|
2015-04-22 15:43:08 -07:00
|
|
|
sources += [
|
2015-05-25 10:45:43 +02:00
|
|
|
"logging.cc",
|
|
|
|
|
"logging.h",
|
2016-04-24 17:32:48 +02:00
|
|
|
"logging_mac.mm",
|
2015-04-22 15:43:08 -07:00
|
|
|
]
|
|
|
|
|
}
|
2014-09-16 01:03:29 +00:00
|
|
|
}
|
|
|
|
|
|
2015-01-21 20:22:33 +00:00
|
|
|
static_library("rtc_base") {
|
2014-06-17 08:54:03 +00:00
|
|
|
cflags = []
|
|
|
|
|
cflags_cc = []
|
2014-09-02 11:22:06 +00:00
|
|
|
libs = []
|
2016-04-05 08:13:31 -07:00
|
|
|
deps = [
|
|
|
|
|
"..:webrtc_common",
|
|
|
|
|
]
|
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
|
|
|
public_deps = [
|
|
|
|
|
":rtc_base_approved",
|
|
|
|
|
]
|
2014-06-17 08:54:03 +00:00
|
|
|
|
|
|
|
|
configs += [
|
|
|
|
|
"..:common_config",
|
2016-03-21 11:20:28 -07:00
|
|
|
":openssl_config",
|
2015-01-21 20:22:33 +00:00
|
|
|
":rtc_base_config",
|
2014-06-17 08:54:03 +00:00
|
|
|
]
|
|
|
|
|
|
2014-09-28 17:37:22 +00:00
|
|
|
public_configs = [
|
2014-06-17 08:54:03 +00:00
|
|
|
"..:common_inherited_config",
|
2016-03-21 11:20:28 -07:00
|
|
|
":openssl_config",
|
2015-01-21 20:22:33 +00:00
|
|
|
":rtc_base_config",
|
2014-06-17 08:54:03 +00:00
|
|
|
]
|
|
|
|
|
|
2016-04-25 00:01:36 -07:00
|
|
|
all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
|
|
|
|
|
|
2015-05-25 12:55:39 +02:00
|
|
|
defines = [ "LOGGING=1" ]
|
2014-06-17 08:54:03 +00:00
|
|
|
|
|
|
|
|
sources = [
|
2015-01-28 21:36:55 +00:00
|
|
|
"arraysize.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
"asyncfile.cc",
|
|
|
|
|
"asyncfile.h",
|
2015-06-21 23:37:01 -07:00
|
|
|
"asyncinvoker-inl.h",
|
|
|
|
|
"asyncinvoker.cc",
|
|
|
|
|
"asyncinvoker.h",
|
2015-03-09 22:21:53 +00:00
|
|
|
"asyncpacketsocket.cc",
|
2014-06-17 08:54:03 +00:00
|
|
|
"asyncpacketsocket.h",
|
2015-03-10 00:59:54 +00:00
|
|
|
"asyncresolverinterface.cc",
|
|
|
|
|
"asyncresolverinterface.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
"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",
|
2015-03-09 22:21:53 +00:00
|
|
|
"cryptstring.cc",
|
2014-06-17 08:54:03 +00:00
|
|
|
"cryptstring.h",
|
|
|
|
|
"diskcache.cc",
|
|
|
|
|
"diskcache.h",
|
2015-07-22 12:12:17 -07:00
|
|
|
"filerotatingstream.cc",
|
|
|
|
|
"filerotatingstream.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
"fileutils.cc",
|
|
|
|
|
"fileutils.h",
|
|
|
|
|
"firewallsocketserver.cc",
|
|
|
|
|
"firewallsocketserver.h",
|
|
|
|
|
"flags.cc",
|
|
|
|
|
"flags.h",
|
Use size_t more consistently for packet/payload lengths.
See design doc at https://docs.google.com/a/chromium.org/document/d/1I6nmE9D_BmCY-IoV6MDPY2V6WYpEI-dg2apWXTfZyUI/edit?usp=sharing for more information.
This CL was reviewed and approved in pieces in the following CLs:
https://webrtc-codereview.appspot.com/24209004/
https://webrtc-codereview.appspot.com/24229004/
https://webrtc-codereview.appspot.com/24259004/
https://webrtc-codereview.appspot.com/25109004/
https://webrtc-codereview.appspot.com/26099004/
https://webrtc-codereview.appspot.com/27069004/
https://webrtc-codereview.appspot.com/27969004/
https://webrtc-codereview.appspot.com/27989004/
https://webrtc-codereview.appspot.com/29009004/
https://webrtc-codereview.appspot.com/30929004/
https://webrtc-codereview.appspot.com/30939004/
https://webrtc-codereview.appspot.com/31999004/
Committing as TBR to the original reviewers.
BUG=chromium:81439
TEST=none
TBR=pthatcher,henrik.lundin,tina.legrand,stefan,tkchin,glaznev,kjellander,perkj,mflodman,henrika,asapersson,niklas.enbom
Review URL: https://webrtc-codereview.appspot.com/23129004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7726 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-11-20 22:28:14 +00:00
|
|
|
"format_macros.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
"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",
|
|
|
|
|
"iosfilesystem.mm",
|
|
|
|
|
"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",
|
2015-10-19 09:39:32 -07:00
|
|
|
"networkmonitor.cc",
|
|
|
|
|
"networkmonitor.h",
|
2016-04-28 01:32:48 -07:00
|
|
|
"nullsocketserver.cc",
|
2014-06-17 08:54:03 +00:00
|
|
|
"nullsocketserver.h",
|
2016-04-18 11:13:11 -07:00
|
|
|
"openssl.h",
|
|
|
|
|
"openssladapter.cc",
|
|
|
|
|
"openssladapter.h",
|
|
|
|
|
"openssldigest.cc",
|
|
|
|
|
"openssldigest.h",
|
|
|
|
|
"opensslidentity.cc",
|
|
|
|
|
"opensslidentity.h",
|
|
|
|
|
"opensslstreamadapter.cc",
|
|
|
|
|
"opensslstreamadapter.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
"pathutils.cc",
|
|
|
|
|
"pathutils.h",
|
|
|
|
|
"physicalsocketserver.cc",
|
|
|
|
|
"physicalsocketserver.h",
|
|
|
|
|
"proxydetect.cc",
|
|
|
|
|
"proxydetect.h",
|
|
|
|
|
"proxyinfo.cc",
|
|
|
|
|
"proxyinfo.h",
|
|
|
|
|
"ratelimiter.cc",
|
|
|
|
|
"ratelimiter.h",
|
2015-08-20 12:15:54 +02:00
|
|
|
"rtccertificate.cc",
|
|
|
|
|
"rtccertificate.h",
|
RTCCertificateGenerator added.
This is a new way of generating RTCCertificate objects that is meant
to replace DtlsIdentityStoreInterface and all of its implementations
(clean up work).
It is similar to the identity store in that it generates on the worker
thread and does callback on the signaling thread, but:
- It does not generate identities in the background that you did not
ask for (preemptive generation made more sense before certificates
were parameterized, not so much anymore, and ECDSA which will be most
common takes like <=2 ms to generate).
- As such this code is less complicated than the store's code.
- The API is different, it takes Optional<uint64_t> expires and it
returns RTCCertificates, not SSLIdentities.
- It supports a blocking version of GenerateCertificate that can be
called from any thread, necessary for Chrome which can generate
certificates before the signaling/worker threads have been
initialized as WebRTC-threads (Chrome can invoke this version on
the worker thread outside of WebRTC).
This CL does not remove the identity store, only adds the alternative.
Follow-up CLs will start using it, the store will be removed once it
is no longer used anywhere.
BUG=webrtc:5707, webrtc:5708
R=hta@webrtc.org, torbjorng@webrtc.org
Review URL: https://codereview.webrtc.org/1883813002 .
Cr-Commit-Position: refs/heads/master@{#12381}
2016-04-15 17:55:21 +02:00
|
|
|
"rtccertificategenerator.cc",
|
|
|
|
|
"rtccertificategenerator.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
"sha1.cc",
|
|
|
|
|
"sha1.h",
|
2015-03-09 22:21:53 +00:00
|
|
|
"sha1digest.cc",
|
2014-06-17 08:54:03 +00:00
|
|
|
"sha1digest.h",
|
2016-02-21 01:56:16 -08:00
|
|
|
"sharedexclusivelock.cc",
|
|
|
|
|
"sharedexclusivelock.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
"signalthread.cc",
|
|
|
|
|
"signalthread.h",
|
2015-03-09 22:21:53 +00:00
|
|
|
"sigslot.cc",
|
2014-06-17 08:54:03 +00:00
|
|
|
"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",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
if (build_with_chromium) {
|
|
|
|
|
if (is_win) {
|
2015-09-30 03:48:52 -07:00
|
|
|
sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ]
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
2014-06-28 18:05:22 +00:00
|
|
|
|
|
|
|
|
include_dirs = [
|
2015-09-30 03:48:52 -07:00
|
|
|
"../../webrtc_overrides",
|
2014-08-11 21:06:30 +00:00
|
|
|
"../../boringssl/src/include",
|
2014-06-28 18:05:22 +00:00
|
|
|
]
|
|
|
|
|
|
2015-01-21 20:22:33 +00:00
|
|
|
public_configs += [ ":rtc_base_chromium_config" ]
|
2014-06-28 18:05:22 +00:00
|
|
|
} else {
|
|
|
|
|
sources += [
|
2014-06-17 08:54:03 +00:00
|
|
|
"bandwidthsmoother.cc",
|
|
|
|
|
"bandwidthsmoother.h",
|
|
|
|
|
"callback.h",
|
|
|
|
|
"fileutils_mock.h",
|
|
|
|
|
"httpserver.cc",
|
|
|
|
|
"httpserver.h",
|
|
|
|
|
"json.cc",
|
|
|
|
|
"json.h",
|
2015-07-22 12:12:17 -07:00
|
|
|
"logsinks.cc",
|
|
|
|
|
"logsinks.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
"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",
|
2015-05-25 12:55:39 +02:00
|
|
|
"scopedptrcollection.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
"sec_buffer.h",
|
|
|
|
|
"sslconfig.h",
|
|
|
|
|
"sslroots.h",
|
2016-04-05 08:13:31 -07:00
|
|
|
"testbase64.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
"testclient.cc",
|
|
|
|
|
"testclient.h",
|
|
|
|
|
"transformadapter.cc",
|
|
|
|
|
"transformadapter.h",
|
|
|
|
|
"versionparsing.cc",
|
|
|
|
|
"versionparsing.h",
|
|
|
|
|
"virtualsocketserver.cc",
|
|
|
|
|
"virtualsocketserver.h",
|
|
|
|
|
"window.h",
|
|
|
|
|
"windowpicker.h",
|
2015-05-25 12:55:39 +02:00
|
|
|
"windowpickerfactory.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
]
|
|
|
|
|
|
2016-04-05 08:13:31 -07:00
|
|
|
if (is_linux) {
|
|
|
|
|
sources += [
|
|
|
|
|
"dbus.cc",
|
|
|
|
|
"dbus.h",
|
|
|
|
|
"libdbusglibsymboltable.cc",
|
|
|
|
|
"libdbusglibsymboltable.h",
|
|
|
|
|
"linuxfdwalk.c",
|
|
|
|
|
"linuxfdwalk.h",
|
|
|
|
|
]
|
|
|
|
|
}
|
2015-02-26 13:59:22 +00:00
|
|
|
|
2014-06-28 18:05:22 +00:00
|
|
|
if (is_posix) {
|
|
|
|
|
sources += [
|
|
|
|
|
"latebindingsymboltable.cc",
|
|
|
|
|
"latebindingsymboltable.h",
|
|
|
|
|
"posix.cc",
|
|
|
|
|
"posix.h",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_mac) {
|
|
|
|
|
sources += [
|
|
|
|
|
"macasyncsocket.cc",
|
|
|
|
|
"macasyncsocket.h",
|
|
|
|
|
"maccocoasocketserver.h",
|
|
|
|
|
"maccocoasocketserver.mm",
|
|
|
|
|
"macsocketserver.cc",
|
|
|
|
|
"macsocketserver.h",
|
|
|
|
|
"macwindowpicker.cc",
|
|
|
|
|
"macwindowpicker.h",
|
|
|
|
|
]
|
|
|
|
|
}
|
2014-06-17 08:54:03 +00:00
|
|
|
|
|
|
|
|
if (is_win) {
|
|
|
|
|
sources += [
|
|
|
|
|
"diskcache_win32.cc",
|
|
|
|
|
"diskcache_win32.h",
|
2014-06-28 18:05:22 +00:00
|
|
|
"win32regkey.cc",
|
|
|
|
|
"win32regkey.h",
|
|
|
|
|
"win32socketinit.cc",
|
|
|
|
|
"win32socketinit.h",
|
|
|
|
|
"win32socketserver.cc",
|
|
|
|
|
"win32socketserver.h",
|
2014-06-17 08:54:03 +00:00
|
|
|
]
|
|
|
|
|
}
|
2014-09-07 17:36:10 +00:00
|
|
|
if (rtc_build_json) {
|
2014-09-02 11:22:06 +00:00
|
|
|
deps += [ "//third_party/jsoncpp" ]
|
|
|
|
|
} else {
|
2014-09-07 17:36:10 +00:00
|
|
|
include_dirs += [ rtc_jsoncpp_root ]
|
2014-06-17 08:54:03 +00:00
|
|
|
|
2014-09-02 11:22:06 +00:00
|
|
|
# When defined changes the include path for json.h to where it is
|
|
|
|
|
# expected to be when building json outside of the standalone build.
|
|
|
|
|
defines += [ "WEBRTC_EXTERNAL_JSON" ]
|
|
|
|
|
}
|
2014-06-28 18:05:22 +00:00
|
|
|
} # !build_with_chromium
|
2014-06-17 08:54:03 +00:00
|
|
|
|
2015-01-21 20:22:33 +00:00
|
|
|
# TODO(henrike): issue 3307, make rtc_base build with the Chromium default
|
2014-06-29 13:37:08 +00:00
|
|
|
# compiler settings.
|
|
|
|
|
configs -= [ "//build/config/compiler:chromium_code" ]
|
|
|
|
|
configs += [ "//build/config/compiler:no_chromium_code" ]
|
2014-12-12 12:10:46 +00:00
|
|
|
if (!is_win) {
|
|
|
|
|
cflags += [ "-Wno-uninitialized" ]
|
|
|
|
|
cflags_cc += [ "-Wno-non-virtual-dtor" ]
|
|
|
|
|
}
|
2014-06-17 08:54:03 +00:00
|
|
|
|
2016-04-18 11:13:11 -07:00
|
|
|
if (rtc_build_ssl) {
|
|
|
|
|
deps += [ "//third_party/boringssl" ]
|
|
|
|
|
} else {
|
|
|
|
|
configs += [ "external_ssl_library" ]
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_android) {
|
2014-06-28 18:05:22 +00:00
|
|
|
sources += [
|
|
|
|
|
"ifaddrs-android.cc",
|
|
|
|
|
"ifaddrs-android.h",
|
|
|
|
|
]
|
|
|
|
|
|
2014-09-02 11:22:06 +00:00
|
|
|
libs += [
|
2014-06-17 08:54:03 +00:00
|
|
|
"log",
|
2015-05-25 12:55:39 +02:00
|
|
|
"GLESv2",
|
2014-06-17 08:54:03 +00:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-05 08:13:31 -07:00
|
|
|
if (is_ios || is_mac) {
|
2015-05-21 13:50:59 +02:00
|
|
|
sources += [
|
2016-03-22 03:32:14 -07:00
|
|
|
"maccocoathreadhelper.h",
|
|
|
|
|
"maccocoathreadhelper.mm",
|
2015-05-21 13:50:59 +02:00
|
|
|
"macconversion.cc",
|
|
|
|
|
"macconversion.h",
|
2016-04-05 08:13:31 -07:00
|
|
|
"macifaddrs_converter.cc",
|
|
|
|
|
"scoped_autorelease_pool.h",
|
|
|
|
|
"scoped_autorelease_pool.mm",
|
2015-05-21 13:50:59 +02:00
|
|
|
]
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
|
|
|
|
|
2014-09-02 11:22:06 +00:00
|
|
|
if (use_x11) {
|
|
|
|
|
sources += [
|
|
|
|
|
"x11windowpicker.cc",
|
|
|
|
|
"x11windowpicker.h",
|
|
|
|
|
]
|
|
|
|
|
libs += [
|
2014-06-17 08:54:03 +00:00
|
|
|
"dl",
|
|
|
|
|
"rt",
|
|
|
|
|
"Xext",
|
|
|
|
|
"X11",
|
|
|
|
|
"Xcomposite",
|
|
|
|
|
"Xrender",
|
|
|
|
|
]
|
2014-09-02 11:22:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_linux) {
|
|
|
|
|
libs += [
|
|
|
|
|
"dl",
|
|
|
|
|
"rt",
|
|
|
|
|
]
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_mac) {
|
2014-06-28 18:05:22 +00:00
|
|
|
sources += [
|
|
|
|
|
"macutils.cc",
|
|
|
|
|
"macutils.h",
|
|
|
|
|
]
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_win) {
|
2014-06-28 18:05:22 +00: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",
|
|
|
|
|
]
|
|
|
|
|
|
2014-09-02 11:22:06 +00:00
|
|
|
libs += [
|
2014-06-17 08:54:03 +00:00
|
|
|
"crypt32.lib",
|
|
|
|
|
"iphlpapi.lib",
|
|
|
|
|
"secur32.lib",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
cflags += [
|
|
|
|
|
# Suppress warnings about WIN32_LEAN_AND_MEAN.
|
|
|
|
|
"/wd4005",
|
|
|
|
|
"/wd4703",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
defines += [ "_CRT_NONSTDC_NO_DEPRECATE" ]
|
|
|
|
|
}
|
|
|
|
|
|
2016-04-05 08:13:31 -07:00
|
|
|
if (is_posix) {
|
|
|
|
|
sources += [
|
|
|
|
|
"ifaddrs_converter.cc",
|
|
|
|
|
"ifaddrs_converter.h",
|
|
|
|
|
"unixfilesystem.cc",
|
|
|
|
|
"unixfilesystem.h",
|
|
|
|
|
]
|
|
|
|
|
if (is_debug) {
|
|
|
|
|
# The Chromium 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.
|
|
|
|
|
defines += [ "_DEBUG" ]
|
|
|
|
|
}
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
|
|
|
|
|
2015-02-23 19:08:31 +00:00
|
|
|
if (is_ios || (is_mac && current_cpu != "x86")) {
|
2014-06-17 08:54:03 +00:00
|
|
|
defines += [ "CARBON_DEPRECATED=YES" ]
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-28 18:05:22 +00:00
|
|
|
if (is_linux || is_android) {
|
|
|
|
|
sources += [
|
2014-06-17 08:54:03 +00:00
|
|
|
"linux.cc",
|
|
|
|
|
"linux.h",
|
|
|
|
|
]
|
|
|
|
|
}
|
2015-09-01 11:36:40 -07:00
|
|
|
|
|
|
|
|
if (is_nacl) {
|
|
|
|
|
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
|
|
|
|
|
defines += [ "timezone=_timezone" ]
|
2016-01-09 13:12:04 -08:00
|
|
|
sources -= [ "ifaddrs_converter.cc" ]
|
2015-09-01 11:36:40 -07:00
|
|
|
}
|
2014-06-17 08:54:03 +00:00
|
|
|
}
|
2015-11-26 23:18:23 -08:00
|
|
|
|
2016-02-05 00:23:50 -08:00
|
|
|
source_set("gtest_prod") {
|
|
|
|
|
sources = [
|
|
|
|
|
"gtest_prod_util.h",
|
|
|
|
|
]
|
|
|
|
|
}
|