Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1436)

Side by Side Diff: third_party/libjingle/BUILD.gn

Issue 1419253002: Rearrange dependency to enable adding finch experiment in webrtc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address Sergey's comments. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/libjingle/libjingle_common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 7
8 # From third_party/libjingle/libjingle.gyp's target_defaults. 8 # From third_party/libjingle/libjingle.gyp's target_defaults.
9 config("jingle_unexported_configs") { 9 config("jingle_unexported_configs") {
10 defines = [ 10 defines = [
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 "//third_party/webrtc/base:rtc_base", 249 "//third_party/webrtc/base:rtc_base",
250 ":libjingle_p2p_constants", 250 ":libjingle_p2p_constants",
251 ] 251 ]
252 252
253 # From libjingle_common.gypi's conditions list. 253 # From libjingle_common.gypi's conditions list.
254 if (is_win) { 254 if (is_win) {
255 cflags = [ "/wd4005" ] 255 cflags = [ "/wd4005" ]
256 } 256 }
257 257
258 if (is_nacl) { 258 if (is_nacl) {
259 deps += [ "//native_client_sdk/src/libraries/nacl_io" ] 259 # For NACL, we have to add a default implementation for field_trail.
260 deps += [
261 "//native_client_sdk/src/libraries/nacl_io",
262 "//third_party/webrtc/system_wrappers:field_trial_default",
263 ]
264 } else {
265 # Otherwise, we just add the field_trial which redirects to base.
266 sources += [ "overrides/field_trial.cc" ]
260 } 267 }
261 268
262 configs += [ ":jingle_unexported_configs" ] 269 configs += [ ":jingle_unexported_configs" ]
263 public_configs = [ ":jingle_public_configs" ] 270 public_configs = [ ":jingle_public_configs" ]
264 all_dependent_configs = [ ":jingle_all_dependent_configs" ] 271 all_dependent_configs = [ ":jingle_all_dependent_configs" ]
265 } 272 }
266 273
267 # This has to be is a separate project due to a bug in MSVS 2008 and the 274 # This has to be is a separate project due to a bug in MSVS 2008 and the
268 # current toolset on android. The problem is that we have two files named 275 # current toolset on android. The problem is that we have two files named
269 # "constants.cc" and MSVS/android doesn't handle this properly. 276 # "constants.cc" and MSVS/android doesn't handle this properly.
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 "$p2p_dir/stunprober/stunprober.cc", 508 "$p2p_dir/stunprober/stunprober.cc",
502 ] 509 ]
503 510
504 deps = [ 511 deps = [
505 "//third_party/webrtc/base:rtc_base", 512 "//third_party/webrtc/base:rtc_base",
506 ":libjingle_webrtc_common", 513 ":libjingle_webrtc_common",
507 ] 514 ]
508 } 515 }
509 } # enable_webrtc 516 } # enable_webrtc
510 # TODO(GYP): Port libjingle.gyp's enable_webrtc condition block. 517 # TODO(GYP): Port libjingle.gyp's enable_webrtc condition block.
OLDNEW
« no previous file with comments | « no previous file | third_party/libjingle/libjingle_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698