Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2015 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 import("//testing/test.gni") | 10 import("//testing/test.gni") |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 104 ":libjingle_peerconnection_warnings_config", | 104 ":libjingle_peerconnection_warnings_config", |
| 105 ] | 105 ] |
| 106 public_configs = [ "..:common_inherited_config" ] | 106 public_configs = [ "..:common_inherited_config" ] |
| 107 | 107 |
| 108 if (is_clang) { | 108 if (is_clang) { |
| 109 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 109 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 110 configs -= [ "//build/config/clang:find_bad_constructs" ] | 110 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 111 } | 111 } |
| 112 | 112 |
| 113 deps = [ | 113 deps = [ |
| 114 "../call", | 114 "../media:rtc_media", |
|
kjellander_webrtc
2016/08/18 10:22:39
You're removing the dependency on ../call here. Pl
|
kjellander_webrtc
2016/08/18 10:22:39
This change does nothing, the default group in med
|
| 115 "../media", | 115 "../pc:rtc_pc", |
|
kjellander_webrtc
2016/08/18 10:22:39
Same for this.
| |
| 116 "../pc", | 116 "../system_wrappers:field_trial_default", |
| 117 ] | 117 ] |
| 118 | 118 |
| 119 if (rtc_use_quic) { | 119 if (rtc_use_quic) { |
| 120 sources += [ | 120 sources += [ |
| 121 "quicdatachannel.cc", | 121 "quicdatachannel.cc", |
| 122 "quicdatachannel.h", | 122 "quicdatachannel.h", |
| 123 "quicdatatransport.cc", | 123 "quicdatatransport.cc", |
| 124 "quicdatatransport.h", | 124 "quicdatatransport.h", |
| 125 ] | 125 ] |
| 126 deps += [ "//third_party/libquic" ] | 126 deps += [ "//third_party/libquic" ] |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 189 | 189 |
| 190 if (is_win) { | 190 if (is_win) { |
| 191 cflags += [ | 191 cflags += [ |
| 192 "/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatc h. | 192 "/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatc h. |
| 193 "/wd4389", # signed/unsigned mismatch. | 193 "/wd4389", # signed/unsigned mismatch. |
| 194 ] | 194 ] |
| 195 } | 195 } |
| 196 | 196 |
| 197 deps = [ | 197 deps = [ |
| 198 ":libjingle_peerconnection", | 198 ":libjingle_peerconnection", |
| 199 "../system_wrappers:field_trial_default", | |
| 200 "../system_wrappers:metrics_default", | 199 "../system_wrappers:metrics_default", |
| 201 ] | 200 ] |
| 202 | 201 |
| 203 if (rtc_build_libyuv) { | 202 if (rtc_build_libyuv) { |
| 204 deps += [ "$rtc_libyuv_dir" ] | 203 deps += [ "$rtc_libyuv_dir" ] |
| 205 public_deps = [ | 204 public_deps = [ |
| 206 "$rtc_libyuv_dir", | 205 "$rtc_libyuv_dir", |
| 207 ] | 206 ] |
| 208 } else { | 207 } else { |
| 209 # Need to add a directory normally exported by libyuv. | 208 # Need to add a directory normally exported by libyuv. |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 391 "../pc:rtc_pc", | 390 "../pc:rtc_pc", |
| 392 "../system_wrappers:metrics_default", | 391 "../system_wrappers:metrics_default", |
| 393 "//testing/gmock", | 392 "//testing/gmock", |
| 394 ] | 393 ] |
| 395 | 394 |
| 396 if (is_android) { | 395 if (is_android) { |
| 397 deps += [ "//testing/android/native_test:native_test_support" ] | 396 deps += [ "//testing/android/native_test:native_test_support" ] |
| 398 } | 397 } |
| 399 } | 398 } |
| 400 } | 399 } |
| OLD | NEW |