OLD | NEW |
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/features.gni") | 5 import("//build/config/features.gni") |
6 | 6 |
7 config("jingle_unexported_configs") { | 7 config("jingle_unexported_configs") { |
8 include_dirs = [ | 8 include_dirs = [ |
9 "../../third_party/webrtc_overrides", | 9 "../../third_party/webrtc_overrides", |
10 "../../testing/gtest/include", | 10 "../../testing/gtest/include", |
(...skipping 26 matching lines...) Expand all Loading... |
37 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 37 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
38 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 38 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
39 | 39 |
40 public_deps = [ | 40 public_deps = [ |
41 ":jingle_deps", | 41 ":jingle_deps", |
42 | 42 |
43 # TODO(kjellander): Start cleaning up this target as soon as | 43 # TODO(kjellander): Start cleaning up this target as soon as |
44 # https://codereview.chromium.org/2022833002/ is landed. The target should | 44 # https://codereview.chromium.org/2022833002/ is landed. The target should |
45 # be removed entirely if possible. | 45 # be removed entirely if possible. |
46 "//third_party/webrtc/base:rtc_base", | 46 "//third_party/webrtc/base:rtc_base", |
| 47 "//third_party/webrtc/base:rtc_task_runner", |
47 ] | 48 ] |
48 deps = [ | 49 deps = [ |
49 "//third_party/webrtc/p2p:rtc_p2p", | 50 "//third_party/webrtc/p2p:rtc_p2p", |
50 ] | 51 ] |
51 | 52 |
52 # From libjingle_common.gypi's conditions list. | 53 # From libjingle_common.gypi's conditions list. |
53 if (is_win) { | 54 if (is_win) { |
54 cflags = [ "/wd4005" ] | 55 cflags = [ "/wd4005" ] |
55 } | 56 } |
56 | 57 |
(...skipping 12 matching lines...) Expand all Loading... |
69 | 70 |
70 configs += [ | 71 configs += [ |
71 ":jingle_unexported_configs", | 72 ":jingle_unexported_configs", |
72 "//third_party/webrtc:common_config", | 73 "//third_party/webrtc:common_config", |
73 ] | 74 ] |
74 public_configs = [ | 75 public_configs = [ |
75 ":jingle_public_configs", | 76 ":jingle_public_configs", |
76 "//third_party/webrtc:common_inherited_config", | 77 "//third_party/webrtc:common_inherited_config", |
77 ] | 78 ] |
78 } | 79 } |
OLD | NEW |