Chromium Code Reviews| Index: webrtc/base/BUILD.gn |
| diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn |
| index 1d258058720b1846f71aa2e891e5551cab6f36d4..97343c5a3e6a6444ce633c6ccdb484aa43bb7801 100644 |
| --- a/webrtc/base/BUILD.gn |
| +++ b/webrtc/base/BUILD.gn |
| @@ -17,6 +17,9 @@ if (is_android) { |
| if (is_win) { |
| import("//build/config/clang/clang.gni") |
| } |
| +if (rtc_use_memcheck) { |
| + import("memcheck_dependencies.gni") |
| +} |
| group("base") { |
| public_deps = [ |
| @@ -210,6 +213,10 @@ rtc_static_library("rtc_base_approved") { |
| "logging_mac.mm", |
| ] |
| } |
| + data = [] |
|
kjellander_webrtc
2016/11/21 08:33:59
I think we should only add memcheck_dependencies f
|
| + if (rtc_use_memcheck) { |
| + data += memcheck_dependencies |
| + } |
| if (is_component_build && is_win) { |
| # Copy the VS runtime DLLs into the isolate so that they don't have to be |
| # preinstalled on the target machine. The debug runtimes have a "d" at |
| @@ -226,7 +233,7 @@ rtc_static_library("rtc_base_approved") { |
| # These runtime files are copied to the output directory by the |
| # vs_toolchain script that runs as part of toolchain configuration. |
| - data = [ |
| + 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
|
| "$root_out_dir/msvcp140${vcrt_suffix}.dll", |
| "$root_out_dir/vccorlib140${vcrt_suffix}.dll", |
| "$root_out_dir/vcruntime140${vcrt_suffix}.dll", |