 Chromium Code Reviews
 Chromium Code Reviews Issue 2602563003:
  Refactor bitrate_controller, remote_bitrate_estimator and congestion_contoller for gn check  (Closed)
    
  
    Issue 2602563003:
  Refactor bitrate_controller, remote_bitrate_estimator and congestion_contoller for gn check  (Closed) 
  | OLD | NEW | 
|---|---|
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 
| 2 # | 2 # | 
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license | 
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source | 
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found | 
| 6 # in the file PATENTS. All contributing project authors may | 6 # in the file PATENTS. All contributing project authors may | 
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. | 
| 8 | 8 | 
| 9 import("../../build/webrtc.gni") | 9 import("../../build/webrtc.gni") | 
| 10 | 10 | 
| 11 rtc_static_library("remote_bitrate_estimator") { | 11 rtc_static_library("remote_bitrate_estimator") { | 
| 12 # TODO(mbonadei): Remove (bugs.webrtc.org/6828) | |
| 13 # Errors on cyclic dependency with: | |
| 14 # rtp_rtcp:rtp_rtcp if enabled. | |
| 15 check_includes = false | |
| 16 | |
| 12 sources = [ | 17 sources = [ | 
| 13 "aimd_rate_control.cc", | 18 "aimd_rate_control.cc", | 
| 14 "aimd_rate_control.h", | 19 "aimd_rate_control.h", | 
| 15 "bwe_defines.cc", | 20 "bwe_defines.cc", | 
| 16 "include/bwe_defines.h", | 21 "include/bwe_defines.h", | 
| 17 "include/remote_bitrate_estimator.h", | 22 "include/remote_bitrate_estimator.h", | 
| 18 "include/send_time_history.h", | 23 "include/send_time_history.h", | 
| 19 "inter_arrival.cc", | 24 "inter_arrival.cc", | 
| 20 "inter_arrival.h", | 25 "inter_arrival.h", | 
| 21 "overuse_detector.cc", | 26 "overuse_detector.cc", | 
| (...skipping 17 matching lines...) Expand all Loading... | |
| 39 defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ] | 44 defines = [ "BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0" ] | 
| 40 } | 45 } | 
| 41 | 46 | 
| 42 if (!build_with_chromium && is_clang) { | 47 if (!build_with_chromium && is_clang) { | 
| 43 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 48 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 44 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 49 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 45 } | 50 } | 
| 46 | 51 | 
| 47 deps = [ | 52 deps = [ | 
| 48 "../..:webrtc_common", | 53 "../..:webrtc_common", | 
| 54 "../../base:rtc_base", | |
| 49 "../../base:rtc_base_approved", | 55 "../../base:rtc_base_approved", | 
| 50 "../../system_wrappers", | 56 "../../system_wrappers", | 
| 51 ] | 57 ] | 
| 52 } | 58 } | 
| 53 | 59 | 
| 54 if (rtc_include_tests) { | 60 if (rtc_include_tests) { | 
| 55 rtc_static_library("bwe_simulator_lib") { | 61 rtc_static_library("bwe_simulator_lib") { | 
| 56 testonly = true | 62 testonly = true | 
| 57 sources = [ | 63 sources = [ | 
| 58 "test/bwe.cc", | 64 "test/bwe.cc", | 
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 95 } | 101 } | 
| 96 | 102 | 
| 97 if (is_win) { | 103 if (is_win) { | 
| 98 cflags = [ | 104 cflags = [ | 
| 99 # TODO(kjellander): Bug 261: fix this warning. | 105 # TODO(kjellander): Bug 261: fix this warning. | 
| 100 "/wd4373", # virtual function override. | 106 "/wd4373", # virtual function override. | 
| 101 ] | 107 ] | 
| 102 } | 108 } | 
| 103 | 109 | 
| 104 deps = [ | 110 deps = [ | 
| 111 ":remote_bitrate_estimator", | |
| 112 "../..:webrtc_common", | |
| 113 "../../base:gtest_prod", | |
| 114 "../../base:rtc_base", | |
| 115 "../../base:rtc_base_approved", | |
| 116 "../../system_wrappers:system_wrappers", | |
| 
kjellander_webrtc
2016/12/27 06:22:55
Please leave out explicit target naming here. "../
 
mbonadei
2016/12/27 14:51:17
Ok, I also removed the explicit target naming from
 | |
| 105 "../../test:test_support", | 117 "../../test:test_support", | 
| 118 "../../voice_engine:voice_engine", | |
| 
kjellander_webrtc
2016/12/27 06:22:55
This is an odd dependency. I think it was introduc
 | |
| 119 "../bitrate_controller:bitrate_controller", | |
| 106 "../congestion_controller", | 120 "../congestion_controller", | 
| 107 "../pacing", | 121 "../pacing", | 
| 122 "../rtp_rtcp:rtp_rtcp", | |
| 108 "//testing/gmock", | 123 "//testing/gmock", | 
| 109 "//testing/gtest", | 124 "//testing/gtest", | 
| 110 ] | 125 ] | 
| 111 } | 126 } | 
| 112 } | 127 } | 
| OLD | NEW |