zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GN: Use rtc_include_tests variable to exclude tests.

Browse Source 
This is closer to what the GYP build does, and is more readable.

BUG=webrtc:5949
TBR=phoglund@webrtc.org
NOTRY=True

Review-Url: https://codereview.webrtc.org/2043873003
Cr-Commit-Position: refs/heads/master@{#13054}
This commit is contained in:
kjellander
2016-06-06 14:00:02 -07:00
committed by Commit bot
parent ba986bfbaf
commit e72db17556
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build_overrides/webrtc.gni
View File

@ -22,3 +22,6 @@ rtc_include_pulse_audio = true
# Chromium uses its own IO handling, so the internal ADM is only built for # Chromium uses its own IO handling, so the internal ADM is only built for
# standalone WebRTC. # standalone WebRTC.
rtc_include_internal_audio_device = true rtc_include_internal_audio_device = true
# There's no point processing WebRTC standalone tests in a Chromium build.
rtc_include_tests = true

3
webrtc/BUILD.gn
View File

@ -379,8 +379,7 @@ if (use_libfuzzer || use_drfuzz) {
} }
} }
# There's no point processing WebRTC standalone tests in a Chromium build. if (!rtc_include_tests) {
if (!build_with_chromium) {
config("rtc_unittests_config") { config("rtc_unittests_config") {
# GN orders flags on a target before flags from configs. The default config # GN orders flags on a target before flags from configs. The default config
# adds -Wall, and this flag have to be after -Wall -- so they need to # adds -Wall, and this flag have to be after -Wall -- so they need to

3
webrtc/base/BUILD.gn
View File

@ -632,8 +632,7 @@ source_set("gtest_prod") {
] ]
} }
# There's no point processing WebRTC standalone tests in a Chromium build. if (!rtc_include_tests) {
if (!build_with_chromium) {
config("rtc_base_test_utils_exported_config") { config("rtc_base_test_utils_exported_config") {
defines = [ "GTEST_RELATIVE_PATH" ] defines = [ "GTEST_RELATIVE_PATH" ]
} }

3
webrtc/system_wrappers/BUILD.gn
View File

@ -193,8 +193,7 @@ if (is_linux) {
} }
} }
# There's no point processing WebRTC standalone tests in a Chromium build. if (!rtc_include_tests) {
if (!build_with_chromium) {
test("system_wrappers_unittests") { test("system_wrappers_unittests") {
testonly = true testonly = true
sources = [ sources = [

3
webrtc/tools/BUILD.gn
View File

@ -170,8 +170,7 @@ source_set("agc_test_utils") {
} }
# Exclude tools depending on gflags since that's not available in Chromium. # Exclude tools depending on gflags since that's not available in Chromium.
# There's no point processing WebRTC standalone tests in a Chromium build. if (!rtc_include_tests) {
if (!build_with_chromium) {
executable("agc_harness") { executable("agc_harness") {
testonly = true testonly = true
sources = [ sources = [