Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

907 lines
23 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.
import("//build/config/crypto.gni")
import("//build/config/ui.gni")
Reland of Moving webrtc.gni up one level from build/ (patchset #1 id:1 of https://codereview.webrtc.org/2657563002/ ) Reason for revert: Starting to work on a fix (it seems that there are third_party dependencies that depends on the path to the webrtc.gni file) Original issue's description: > Revert of Moving webrtc.gni up one level from build/ (patchset #1 id:1 of https://codereview.webrtc.org/2651543003/ ) > > Reason for revert: > This was causing the following failure: https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Builder/builds/838/steps/generate_build_files/logs/stdio > > Original issue's description: > > Moving webrtc.gni up one level from build/ > > > > BUG=webrtc:7030 > > > > Review-Url: https://codereview.webrtc.org/2651543003 > > Cr-Commit-Position: refs/heads/master@{#16241} > > Committed: https://chromium.googlesource.com/external/webrtc/+/35a32700fc9b5d932ddbd528c12f59c3274e4774 > > TBR=kjellander@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7030 > > Review-Url: https://codereview.webrtc.org/2657563002 > Cr-Commit-Position: refs/heads/master@{#16244} > Committed: https://chromium.googlesource.com/external/webrtc/+/69dc7dbe247ead087f3bae0eb7e23f27f0de1ec3 TBR=kjellander@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7030 Review-Url: https://codereview.webrtc.org/2654773002 Cr-Commit-Position: refs/heads/master@{#16247}
2017-01-24 06:58:22 -08:00
import("../webrtc.gni")
if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
}
if (is_win) {
import("//build/config/clang/clang.gni")
}
GN: New conventions, default target and refactorings Introduce a convention on categorizing GN targets: 1. Production code 2. Tests 3. Examples 4. Tools The first two have targets spread out all over the tree, while the latter are isolated to examples/ and tools/ directories. Another new convention: Each directory's BUILD.gn file shall contain a target named similar to the directory name. This target shall contain the 'most common' production code, i.e. so that most consumers of the directory can depend on only the directory (which implicitly means that target in GN). //webrtc:webrtc_tests is changed to depend on all WebRTC tests. From now on, it's necessary to add new test targets to this dependency tree in order to get them compiled. Two new group targets are created: //webrtc/modules/audio_coding:audio_coding_tests //webrtc/modules/audio_processing:audio_processing_tests to reduce the long list of tests in //webrtc:webrtc_tests. Visibility on //webrtc:webrtc and //webrtc:webrtc_tests is restricted to the root target, to avoid circular dependencies due to the monolithic property of these targets (a problem we've had in the past). The 'root' target at the top level is renamed to 'default', which means GN will build this target instead of _all_ generated targets (see https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/faq.md#Can-I-control-what-targets-are-built-by-default). This target now depends on everything we want to build, meaning all targets now explicitly needs to be wired up from the root target in order to get build. Having this, the number of compiled objects on Android is decreased from 8855 to 6276. It also gives us better control over our build. BUG=webrtc:6440 TESTED=git cl try --clobber NOTRY=True Review-Url: https://codereview.webrtc.org/2441383002 Cr-Commit-Position: refs/heads/master@{#14821}
2016-10-28 05:44:03 -07:00
group("base") {
public_deps = [
":rtc_base",
":rtc_base_approved",
":rtc_task_queue",
]
if (is_android) {
public_deps += [ ":base_java" ]
}
}
config("rtc_base_approved_all_dependent_config") {
if (is_mac && !build_with_chromium) {
libs = [ "Foundation.framework" ] # needed for logging_mac.mm
}
}
config("rtc_base_chromium_config") {
defines = [ "NO_MAIN_THREAD_WRAPPING" ]
}
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",
]
}
if (is_mac) {
libs = [
"Cocoa.framework",
"Foundation.framework",
"IOKit.framework",
"Security.framework",
"SystemConfiguration.framework",
]
}
}
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") {
deps = [
"//third_party/boringssl",
]
}
}
if (!rtc_build_ssl) {
config("external_ssl_library") {
assert(rtc_ssl_root != "",
"You must specify rtc_ssl_root when rtc_build_ssl==0.")
include_dirs = [ rtc_ssl_root ]
}
}
# The subset of rtc_base approved for use outside of libjingle.
rtc_static_library("rtc_base_approved") {
defines = []
libs = []
deps = []
all_dependent_configs = [ ":rtc_base_approved_all_dependent_config" ]
sources = [
"array_view.h",
"arraysize.h",
"atomicops.h",
"base64.cc",
"base64.h",
"basictypes.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",
"file.cc",
"file.h",
"flags.cc",
"flags.h",
"format_macros.h",
"function_view.h",
"ignore_wundef.h",
"location.cc",
"location.h",
"md5.cc",
"md5.h",
"md5digest.cc",
"md5digest.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
"mod_ops.h",
"onetimeevent.h",
"optional.cc",
"optional.h",
"pathutils.cc",
"pathutils.h",
"platform_file.cc",
"platform_file.h",
"platform_thread.cc",
"platform_thread.h",
"platform_thread_types.h",
"ptr_util.h",
"race_checker.cc",
"race_checker.h",
"random.cc",
"random.h",
"rate_limiter.cc",
"rate_limiter.h",
"rate_statistics.cc",
"rate_statistics.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
"ratetracker.cc",
"ratetracker.h",
"refcount.h",
"refcountedobject.h",
"safe_compare.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",
"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",
]
if (is_android) {
libs += [ "log" ]
}
if (is_posix) {
sources += [ "file_posix.cc" ]
}
if (is_win) {
sources += [ "file_win.cc" ]
}
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",
]
} else {
sources += [
"logging.cc",
"logging.h",
"logging_mac.mm",
]
}
if (is_component_build && is_win) {
# Copy the VS runtime DLLs into the isolate so that they don't have to be
# preinstalled on the target machine. The debug runtimes have a "d" at
# the end.
# This is a copy of https://codereview.chromium.org/1783973002.
# TODO(ehmaldonado): We'd like Chromium to make this changes easier to use,
# so we don't have to copy their changes and risk breakages.
# See http://crbug.com/653569
if (is_debug) {
vcrt_suffix = "d"
} else {
vcrt_suffix = ""
}
# These runtime files are copied to the output directory by the
# vs_toolchain script that runs as part of toolchain configuration.
data = [
"$root_out_dir/msvcp140${vcrt_suffix}.dll",
"$root_out_dir/vccorlib140${vcrt_suffix}.dll",
"$root_out_dir/vcruntime140${vcrt_suffix}.dll",
# Universal Windows 10 CRT files
"$root_out_dir/api-ms-win-core-console-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-datetime-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-debug-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-errorhandling-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-file-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-file-l1-2-0.dll",
"$root_out_dir/api-ms-win-core-file-l2-1-0.dll",
"$root_out_dir/api-ms-win-core-handle-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-heap-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-interlocked-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-libraryloader-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-localization-l1-2-0.dll",
"$root_out_dir/api-ms-win-core-memory-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-namedpipe-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-processenvironment-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-processthreads-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-processthreads-l1-1-1.dll",
"$root_out_dir/api-ms-win-core-profile-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-rtlsupport-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-string-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-synch-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-synch-l1-2-0.dll",
"$root_out_dir/api-ms-win-core-sysinfo-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-timezone-l1-1-0.dll",
"$root_out_dir/api-ms-win-core-util-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-conio-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-convert-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-environment-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-filesystem-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-heap-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-locale-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-math-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-multibyte-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-private-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-process-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-runtime-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-stdio-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-string-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-time-l1-1-0.dll",
"$root_out_dir/api-ms-win-crt-utility-l1-1-0.dll",
"$root_out_dir/ucrtbase${vcrt_suffix}.dll",
]
if (is_asan) {
if (current_cpu == "x64") {
data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_rt.asan_dynamic-x86_64.dll" ]
} else {
data += [ "$clang_base_path/lib/clang/$clang_version/lib/windows/clang_rt.asan_dynamic-i386.dll" ]
}
}
}
Reland: Use native (optimized) functions for byte order conversion. (patchset #1 id:1 of https://codereview.webrtc.org/2755103002/ ) Reason for revert: The problem with the internal project has been solved according to mbonadei@ Original issue's description: > Revert of Reland: Use native (optimized) functions for byte order conversion. (patchset #5 id:80001 of https://codereview.webrtc.org/2751403003/ ) > > Reason for revert: > Breaks internal project. > > Original issue's description: > > Reland: Use native (optimized) functions for byte order conversion. > > > > Instead of manually copying single bytes, the native functions like "htobe32" > > are used. > > > > The previous CL https://codereview.webrtc.org/2738063005/ got reverted in > > https://codereview.webrtc.org/2757703002/ > > > > Reland with the compilation errors fixed. > > > > BUG=None > > > > Review-Url: https://codereview.webrtc.org/2751403003 > > Cr-Commit-Position: refs/heads/master@{#17280} > > Committed: https://chromium.googlesource.com/external/webrtc/+/c8a4c1f24ca3a2ececeb1b3774e1fc80f8ffe631 > > TBR=tommi@webrtc.org,jbauch@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=None > > Review-Url: https://codereview.webrtc.org/2755103002 > Cr-Commit-Position: refs/heads/master@{#17282} > Committed: https://chromium.googlesource.com/external/webrtc/+/44122bd0f96b30983091f5be26b57e45f6cc9e33 TBR=tommi@webrtc.org,kthelgason@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=None Review-Url: https://codereview.webrtc.org/2786993003 Cr-Commit-Position: refs/heads/master@{#17479}
2017-03-31 01:42:09 -07:00
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
}
}
config("enable_libevent_config") {
defines = [ "WEBRTC_BUILD_LIBEVENT" ]
}
rtc_static_library("rtc_task_queue") {
public_deps = [
":rtc_base_approved",
]
sources = [
"sequenced_task_checker.h",
"sequenced_task_checker_impl.cc",
"sequenced_task_checker_impl.h",
"weak_ptr.cc",
"weak_ptr.h",
]
if (build_with_chromium) {
sources += [
"../../webrtc_overrides/webrtc/base/task_queue.cc",
"../../webrtc_overrides/webrtc/base/task_queue.h",
]
} else {
sources += [
"task_queue.h",
"task_queue_posix.h",
]
if (rtc_build_libevent) {
deps = [
"//base/third_party/libevent",
]
}
if (rtc_enable_libevent) {
sources += [
"task_queue_libevent.cc",
"task_queue_posix.cc",
]
all_dependent_configs = [ ":enable_libevent_config" ]
} else {
if (is_mac || is_ios) {
sources += [
"task_queue_gcd.cc",
"task_queue_posix.cc",
]
}
if (is_win) {
sources += [ "task_queue_win.cc" ]
}
}
}
}
rtc_static_library("rtc_numerics") {
sources = [
"numerics/exp_filter.cc",
"numerics/exp_filter.h",
"numerics/percentile_filter.h",
]
deps = [
":rtc_base_approved",
]
}
config("rtc_base_warnings_config") {
if (is_win && is_clang) {
cflags = [
# 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",
]
}
}
rtc_static_library("rtc_base") {
cflags = []
cflags_cc = []
libs = []
defines = []
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
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",
]
public_configs = []
all_dependent_configs = [ ":rtc_base_all_dependent_config" ]
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",
"asyncinvoker-inl.h",
"asyncinvoker.cc",
"asyncinvoker.h",
"asyncpacketsocket.cc",
"asyncpacketsocket.h",
"asyncresolverinterface.cc",
"asyncresolverinterface.h",
"asyncsocket.cc",
"asyncsocket.h",
"asynctcpsocket.cc",
"asynctcpsocket.h",
"asyncudpsocket.cc",
"asyncudpsocket.h",
"crc32.cc",
"crc32.h",
"cryptstring.cc",
"cryptstring.h",
"filerotatingstream.cc",
"filerotatingstream.h",
"fileutils.cc",
"fileutils.h",
"gunit_prod.h",
"helpers.cc",
"helpers.h",
"httpbase.cc",
"httpbase.h",
"httpcommon-inl.h",
"httpcommon.cc",
"httpcommon.h",
"ipaddress.cc",
"ipaddress.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",
"physicalsocketserver.cc",
"physicalsocketserver.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",
"socketserver.h",
"socketstream.cc",
"socketstream.h",
"ssladapter.cc",
"ssladapter.h",
"sslfingerprint.cc",
"sslfingerprint.h",
"sslidentity.cc",
"sslidentity.h",
"sslstreamadapter.cc",
"sslstreamadapter.h",
"stream.cc",
"stream.h",
"thread.cc",
"thread.h",
]
# TODO(henrike): issue 3307, make rtc_base build with the Chromium default
# compiler settings.
suppressed_configs += [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
if (!is_win) {
cflags += [ "-Wno-uninitialized" ]
}
if (build_with_chromium) {
if (is_win) {
sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ]
}
include_dirs = [ "../../boringssl/src/include" ]
public_configs += [ ":rtc_base_chromium_config" ]
} else {
configs += [ ":rtc_base_warnings_config" ]
sources += [
"callback.h",
"json.cc",
"json.h",
"logsinks.cc",
"logsinks.h",
"mathutils.h",
"optionsfile.cc",
"optionsfile.h",
"rollingaccumulator.h",
"scopedptrcollection.h",
"sslroots.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
"testbase64.h",
"testclient.cc",
"testclient.h",
"transformadapter.cc",
"transformadapter.h",
"virtualsocketserver.cc",
"virtualsocketserver.h",
"window.h",
]
if (is_win) {
sources += [
"win32socketinit.cc",
"win32socketinit.h",
"win32socketserver.cc",
"win32socketserver.h",
]
}
if (rtc_build_json) {
deps += [ "//third_party/jsoncpp" ]
} else {
include_dirs = [ "$rtc_jsoncpp_root" ]
# 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" ]
}
} # !build_with_chromium
if (rtc_build_ssl) {
deps += [ "//third_party/boringssl" ]
} else {
configs += [ ":external_ssl_library" ]
}
if (is_android) {
sources += [
"ifaddrs-android.cc",
"ifaddrs-android.h",
]
libs += [
"log",
"GLESv2",
]
}
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
if (is_ios || is_mac) {
sources += [
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
"macifaddrs_converter.cc",
"thread_darwin.mm",
]
}
if (use_x11) {
libs += [
"dl",
"rt",
"Xext",
"X11",
"Xcomposite",
"Xrender",
]
}
if (is_linux) {
libs += [
"dl",
"rt",
]
}
if (is_mac) {
sources += [
"macutils.cc",
"macutils.h",
]
libs += [
# For ProcessInformationCopyDictionary in unixfilesystem.cc.
"ApplicationServices.framework",
]
}
if (is_win) {
sources += [
"win32.cc",
"win32.h",
"win32filesystem.cc",
"win32filesystem.h",
"win32securityerrors.cc",
"win32window.cc",
"win32window.h",
"winping.cc",
"winping.h",
]
libs += [
"crypt32.lib",
"iphlpapi.lib",
"secur32.lib",
]
cflags += [
# Suppress warnings about WIN32_LEAN_AND_MEAN.
"/wd4005",
"/wd4703",
]
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
if (is_posix) {
sources += [
"ifaddrs_converter.cc",
"ifaddrs_converter.h",
"unixfilesystem.cc",
"unixfilesystem.h",
]
}
if (is_nacl) {
deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
defines += [ "timezone=_timezone" ]
sources -= [ "ifaddrs_converter.cc" ]
}
if (is_win && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_source_set("gtest_prod") {
sources = [
"gtest_prod_util.h",
]
}
if (rtc_include_tests) {
config("rtc_base_tests_utils_exported_config") {
defines = [ "GTEST_RELATIVE_PATH" ]
}
config("rtc_base_tests_utils_warnings_config") {
if (is_win && is_clang) {
cflags = [
# See https://bugs.chromium.org/p/webrtc/issues/detail?id=6270
"-Wno-reorder",
"-Wno-sign-compare",
]
}
}
rtc_source_set("rtc_base_tests_main") {
testonly = true
sources = [
"unittest_main.cc",
]
public_configs = [ ":rtc_base_tests_utils_exported_config" ]
deps = [
":rtc_base_tests_utils",
]
public_deps = [
"//testing/gmock",
"//testing/gtest",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_source_set("rtc_base_tests_utils") {
testonly = true
sources = [
# Also use this as a convenient dumping ground for misc files that are
# included by multiple targets below.
"cpu_time.cc",
"cpu_time.h",
"fakeclock.cc",
"fakeclock.h",
"fakenetwork.h",
"fakesslidentity.h",
"firewallsocketserver.cc",
"firewallsocketserver.h",
"gunit.h",
"httpserver.cc",
"httpserver.h",
"memory_usage.cc",
"memory_usage.h",
"natserver.cc",
"natserver.h",
"natsocketfactory.cc",
"natsocketfactory.h",
"nattypes.cc",
"nattypes.h",
"proxyserver.cc",
"proxyserver.h",
"sigslottester.h",
"sigslottester.h.pump",
"testbase64.h",
"testechoserver.h",
"testutils.h",
"timedelta.h",
]
configs += [ ":rtc_base_tests_utils_warnings_config" ]
public_configs = [ ":rtc_base_tests_utils_exported_config" ]
deps = [
":rtc_base",
"../test:field_trial",
"../test:test_support",
]
public_deps = [
"//testing/gmock",
"//testing/gtest",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_source_set("rtc_base_nonparallel_tests") {
testonly = true
sources = [
"cpu_time_unittest.cc",
"filerotatingstream_unittest.cc",
"nullsocketserver_unittest.cc",
"physicalsocketserver_unittest.cc",
"socket_unittest.cc",
"socket_unittest.h",
"socketaddress_unittest.cc",
"virtualsocket_unittest.cc",
]
deps = [
":rtc_base",
":rtc_base_tests_main",
"//testing/gtest",
]
if (is_win) {
sources += [ "win32socketserver_unittest.cc" ]
}
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_source_set("rtc_base_approved_unittests") {
testonly = true
sources = [
"array_view_unittest.cc",
"atomicops_unittest.cc",
"base64_unittest.cc",
"basictypes_unittest.cc",
"bind_unittest.cc",
"bitbuffer_unittest.cc",
"buffer_unittest.cc",
"bufferqueue_unittest.cc",
"bytebuffer_unittest.cc",
"byteorder_unittest.cc",
"copyonwritebuffer_unittest.cc",
"criticalsection_unittest.cc",
"event_tracer_unittest.cc",
"event_unittest.cc",
"file_unittest.cc",
"function_view_unittest.cc",
"logging_unittest.cc",
"md5digest_unittest.cc",
"mod_ops_unittest.cc",
"onetimeevent_unittest.cc",
"optional_unittest.cc",
"pathutils_unittest.cc",
"platform_thread_unittest.cc",
"random_unittest.cc",
"rate_limiter_unittest.cc",
"rate_statistics_unittest.cc",
"ratetracker_unittest.cc",
"refcountedobject_unittest.cc",
"safe_compare_unittest.cc",
"stringencode_unittest.cc",
"stringutils_unittest.cc",
"swap_queue_unittest.cc",
"thread_annotations_unittest.cc",
"thread_checker_unittest.cc",
"timestampaligner_unittest.cc",
"timeutils_unittest.cc",
]
deps = [
":rtc_base_approved",
":rtc_base_tests_main",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_source_set("rtc_task_queue_unittests") {
testonly = true
sources = [
"sequenced_task_checker_unittest.cc",
"task_queue_unittest.cc",
"weak_ptr_unittest.cc",
]
deps = [
":rtc_base_tests_main",
":rtc_task_queue",
]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
rtc_source_set("rtc_numerics_unittests") {
testonly = true
sources = [
"numerics/exp_filter_unittest.cc",
"numerics/percentile_filter_unittest.cc",
]
deps = [
":rtc_base_tests_main",
":rtc_numerics",
]
}
config("rtc_base_unittests_config") {
if (is_clang) {
cflags = [ "-Wno-unused-const-variable" ]
}
}
rtc_source_set("rtc_base_unittests") {
testonly = true
sources = [
"callback_unittest.cc",
"crc32_unittest.cc",
"fileutils_unittest.cc",
"helpers_unittest.cc",
"httpbase_unittest.cc",
"httpcommon_unittest.cc",
"httpserver_unittest.cc",
"ipaddress_unittest.cc",
"memory_usage_unittest.cc",
"messagedigest_unittest.cc",
"messagequeue_unittest.cc",
"nat_unittest.cc",
"network_unittest.cc",
"optionsfile_unittest.cc",
"proxy_unittest.cc",
"ptr_util_unittest.cc",
"ratelimiter_unittest.cc",
"rollingaccumulator_unittest.cc",
"rtccertificate_unittest.cc",
"rtccertificategenerator_unittest.cc",
"scopedptrcollection_unittest.cc",
"sha1digest_unittest.cc",
"sharedexclusivelock_unittest.cc",
"signalthread_unittest.cc",
"sigslot_unittest.cc",
"sigslottester_unittest.cc",
"stream_unittest.cc",
"testclient_unittest.cc",
"thread_unittest.cc",
]
if (is_win) {
sources += [
"win32_unittest.cc",
"win32window_unittest.cc",
]
}
if (is_mac) {
sources += [ "macutils_unittest.cc" ]
}
if (is_posix) {
sources += [
"ssladapter_unittest.cc",
"sslidentity_unittest.cc",
"sslstreamadapter_unittest.cc",
]
}
deps = [
":rtc_base_tests_main",
]
public_deps = [
":rtc_base",
]
configs += [ ":rtc_base_unittests_config" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}
}
if (is_android) {
android_library("base_java") {
java_files = [
"java/src/org/webrtc/Logging.java",
"java/src/org/webrtc/Size.java",
"java/src/org/webrtc/ThreadUtils.java",
]
}
}