Fix inconsistent setting of the rtc_include_unittests flag.

On advice from brettw, se discussion here:
https://codereview.webrtc.org/2149543002/

The problem was we were setting the flag to both false and true,
and the the true happened to win out for WebRTC checkouts and
false for Chromium checkouts. This change should make this
mechanic more obvious.

This change _should_ have no effect downstream.

Doing tbr to see if we can get the chromium import back into a good state today.

TBR=tommi@webrtc.org

Review-Url: https://codereview.webrtc.org/2154693002
Cr-Commit-Position: refs/heads/master@{#13484}
This commit is contained in:
phoglund 2016-07-15 03:56:06 -07:00 committed by Commit bot
parent 4e417b242a
commit 9d34148714
2 changed files with 5 additions and 3 deletions

View File

@ -23,5 +23,8 @@ rtc_include_pulse_audio = true
# standalone WebRTC.
rtc_include_internal_audio_device = true
# There's no point processing WebRTC standalone tests in a Chromium build.
rtc_include_tests = true
# There's no point processing WebRTC standalone tests in a Chromium build,
# so give Chromium the option of overriding it here.
declare_args() {
rtc_include_tests = true
}

View File

@ -62,7 +62,6 @@ declare_args() {
# https://gcc.gnu.org/wiki/LinkTimeOptimization
rtc_use_lto = false
rtc_include_tests = false
rtc_restrict_logging = true
# Enable libevent task queues on platforms that support it.