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

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi

Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
index 7978576845665c425116d803f3981e07a82e2ed0..1823617927bb6e3628e2db4b97c1425648fc2a85 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
@@ -10,10 +10,6 @@
   'includes': [
     '../../build/common.gypi',
   ],
-  'variables': {
-    # Set this to true to enable BWE test logging.
-    'enable_bwe_test_logging%': 0,
-  },
   'targets': [
     {
       'target_name': 'remote_bitrate_estimator',
@@ -47,13 +43,17 @@
         'test/bwe_test_logging.h',
       ], # source
       'conditions': [
-        ['enable_bwe_test_logging==1', {
-          'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1' ],
-          'sources': [
-            'test/bwe_test_logging.cc'
+        ['include_tests==0', {
+          'conditions': [
+            ['enable_bwe_test_logging==1', {
+              'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=1' ],
+              'sources': [
+                'test/bwe_test_logging.cc'
+              ],
+            }, {
+              'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ],
+            }],
           ],
-        }, {
-          'defines': [ 'BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0' ],
         }],
       ],
     },
@@ -71,6 +71,7 @@
             '<(DEPTH)/testing/gmock.gyp:gmock',
           ],
           'sources': [
+            'bwe_simulations.cc',
             'test/bwe.cc',
             'test/bwe.h',
             'test/bwe_test.cc',