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/config/crypto.gni") | 9 import("//build/config/crypto.gni") |
10 import("//build/config/ui.gni") | 10 import("//build/config/ui.gni") |
11 import("../build/webrtc.gni") | 11 import("../build/webrtc.gni") |
12 | 12 |
13 if (is_android) { | 13 if (is_android) { |
14 import("//build/config/android/config.gni") | 14 import("//build/config/android/config.gni") |
15 import("//build/config/android/rules.gni") | 15 import("//build/config/android/rules.gni") |
16 } | 16 } |
17 if (is_win) { | 17 if (is_win) { |
18 import("//build/config/clang/clang.gni") | 18 import("//build/config/clang/clang.gni") |
19 } | 19 } |
20 if (rtc_use_memcheck) { | |
21 import("memcheck_dependencies.gni") | |
22 } | |
20 | 23 |
21 group("base") { | 24 group("base") { |
22 public_deps = [ | 25 public_deps = [ |
23 ":rtc_base", | 26 ":rtc_base", |
24 ":rtc_base_approved", | 27 ":rtc_base_approved", |
25 ":rtc_task_queue", | 28 ":rtc_task_queue", |
26 ] | 29 ] |
27 if (is_android) { | 30 if (is_android) { |
28 public_deps += [ ":base_java" ] | 31 public_deps += [ ":base_java" ] |
29 } | 32 } |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
203 "../../webrtc_overrides/webrtc/base/logging.h", | 206 "../../webrtc_overrides/webrtc/base/logging.h", |
204 ] | 207 ] |
205 include_dirs = [ "../../webrtc_overrides" ] | 208 include_dirs = [ "../../webrtc_overrides" ] |
206 } else { | 209 } else { |
207 sources += [ | 210 sources += [ |
208 "logging.cc", | 211 "logging.cc", |
209 "logging.h", | 212 "logging.h", |
210 "logging_mac.mm", | 213 "logging_mac.mm", |
211 ] | 214 ] |
212 } | 215 } |
216 data = [] | |
kjellander_webrtc
2016/11/21 08:33:59
I think we should only add memcheck_dependencies f
| |
217 if (rtc_use_memcheck) { | |
218 data += memcheck_dependencies | |
219 } | |
213 if (is_component_build && is_win) { | 220 if (is_component_build && is_win) { |
214 # Copy the VS runtime DLLs into the isolate so that they don't have to be | 221 # Copy the VS runtime DLLs into the isolate so that they don't have to be |
215 # preinstalled on the target machine. The debug runtimes have a "d" at | 222 # preinstalled on the target machine. The debug runtimes have a "d" at |
216 # the end. | 223 # the end. |
217 # This is a copy of https://codereview.chromium.org/1783973002. | 224 # This is a copy of https://codereview.chromium.org/1783973002. |
218 # TODO(ehmaldonado): We'd like Chromium to make this changes easier to use, | 225 # TODO(ehmaldonado): We'd like Chromium to make this changes easier to use, |
219 # so we don't have to copy their changes and risk breakages. | 226 # so we don't have to copy their changes and risk breakages. |
220 # See http://crbug.com/653569 | 227 # See http://crbug.com/653569 |
221 if (is_debug) { | 228 if (is_debug) { |
222 vcrt_suffix = "d" | 229 vcrt_suffix = "d" |
223 } else { | 230 } else { |
224 vcrt_suffix = "" | 231 vcrt_suffix = "" |
225 } | 232 } |
226 | 233 |
227 # These runtime files are copied to the output directory by the | 234 # These runtime files are copied to the output directory by the |
228 # vs_toolchain script that runs as part of toolchain configuration. | 235 # vs_toolchain script that runs as part of toolchain configuration. |
229 data = [ | 236 data += [ |
kjellander_webrtc
2016/11/21 08:33:59
I'm not sure these belong in rtc_base_approved tar
ehmaldonado_webrtc
2016/11/22 15:16:01
Yes, this is only needed for executing Windows tes
| |
230 "$root_out_dir/msvcp140${vcrt_suffix}.dll", | 237 "$root_out_dir/msvcp140${vcrt_suffix}.dll", |
231 "$root_out_dir/vccorlib140${vcrt_suffix}.dll", | 238 "$root_out_dir/vccorlib140${vcrt_suffix}.dll", |
232 "$root_out_dir/vcruntime140${vcrt_suffix}.dll", | 239 "$root_out_dir/vcruntime140${vcrt_suffix}.dll", |
233 | 240 |
234 # Universal Windows 10 CRT files | 241 # Universal Windows 10 CRT files |
235 "$root_out_dir/api-ms-win-core-console-l1-1-0.dll", | 242 "$root_out_dir/api-ms-win-core-console-l1-1-0.dll", |
236 "$root_out_dir/api-ms-win-core-datetime-l1-1-0.dll", | 243 "$root_out_dir/api-ms-win-core-datetime-l1-1-0.dll", |
237 "$root_out_dir/api-ms-win-core-debug-l1-1-0.dll", | 244 "$root_out_dir/api-ms-win-core-debug-l1-1-0.dll", |
238 "$root_out_dir/api-ms-win-core-errorhandling-l1-1-0.dll", | 245 "$root_out_dir/api-ms-win-core-errorhandling-l1-1-0.dll", |
239 "$root_out_dir/api-ms-win-core-file-l1-1-0.dll", | 246 "$root_out_dir/api-ms-win-core-file-l1-1-0.dll", |
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
785 "java/src/org/webrtc/Logging.java", | 792 "java/src/org/webrtc/Logging.java", |
786 "java/src/org/webrtc/Size.java", | 793 "java/src/org/webrtc/Size.java", |
787 "java/src/org/webrtc/ThreadUtils.java", | 794 "java/src/org/webrtc/ThreadUtils.java", |
788 ] | 795 ] |
789 | 796 |
790 deps = [ | 797 deps = [ |
791 "//base:base_java", | 798 "//base:base_java", |
792 ] | 799 ] |
793 } | 800 } |
794 } | 801 } |
OLD | NEW |