Enable BWE logging to command line when rtc_enable_bwe_test_logging is set to true

webrtc/modules/remote_bitrate_estimator/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.

[kjellander_webrtc, 2016/09/07 06:21:50]

For the changes in this file, I'm missing similar changes to
https://cs.chromium.org/chromium/src/third_party/webrtc/modules/remote_bitrat...


I suspect you have to move the variable declaration to webrtc/build/common.gypi
for that.

 #
 # 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/webrtc.gni")
 import("//testing/test.gni")
 
-declare_args() {
-  # Set this to true to enable BWE test logging.
-  rtc_enable_bwe_test_logging = false
-}
-
 source_set("remote_bitrate_estimator") {
   sources = [
     "aimd_rate_control.cc",
     "aimd_rate_control.h",
     "bwe_defines.cc",
     "include/bwe_defines.h",
     "include/remote_bitrate_estimator.h",
     "include/send_time_history.h",
     "inter_arrival.cc",
     "inter_arrival.h",
     "overuse_detector.cc",
     "overuse_detector.h",
     "overuse_estimator.cc",
     "overuse_estimator.h",
     "remote_bitrate_estimator_abs_send_time.cc",
     "remote_bitrate_estimator_abs_send_time.h",
     "remote_bitrate_estimator_single_stream.cc",
     "remote_bitrate_estimator_single_stream.h",
     "remote_estimator_proxy.cc",
     "remote_estimator_proxy.h",
     "send_time_history.cc",
     "test/bwe_test_logging.h",
     "transport_feedback_adapter.cc",
     "transport_feedback_adapter.h",
   ]
 
-  if (rtc_enable_bwe_test_logging) {
-    defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1" ]
-    sources += [ "test/bwe_test_logging.cc" ]
-  } else {
-    defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
+  if (!rtc_include_tests) {
+    if (rtc_enable_bwe_test_logging) {
+      defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1" ]
+      sources += [ "test/bwe_test_logging.cc" ]
+    } else {
+      defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ]
+    }
   }
 
   configs += [ "../..:common_config" ]
   public_configs = [ "../..:common_inherited_config" ]
 
   if (is_clang) {
     # Suppress warnings from the Chromium Clang plugins (bugs.webrtc.org/163).
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
   deps = [
     "../..:webrtc_common",
     "../../base:rtc_base_approved",
     "../../system_wrappers",
   ]
 }
 
 if (rtc_include_tests) {
   source_set("bwe_simulator") {
     testonly = true
     sources = [
+      "bwe_simulations.cc",
       "test/bwe.cc",
       "test/bwe.h",
       "test/bwe_test.cc",
       "test/bwe_test.h",
       "test/bwe_test_baselinefile.cc",
       "test/bwe_test_baselinefile.h",
       "test/bwe_test_fileutils.cc",
       "test/bwe_test_fileutils.h",
       "test/bwe_test_framework.cc",
       "test/bwe_test_framework.h",
@@ skipping 38 matching lines @@
     }
 
     deps = [
       "../../test:test_support",
       "../pacing",
       "//testing/gmock",
       "//testing/gtest",
     ]
   }
 }