diff options
author | brucedawson <brucedawson@chromium.org> | 2016-03-10 14:14:22 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-10 22:15:25 +0000 |
commit | cad78b03905d5d9d4f8c8575aa97606444c28ed5 (patch) | |
tree | f008babadb27acde0fe8565d67b36d0709419421 /base/BUILD.gn | |
parent | d12c2b3ab25398ae385564c7506f0e4b598169eb (diff) | |
download | chromium_src-cad78b03905d5d9d4f8c8575aa97606444c28ed5.zip chromium_src-cad78b03905d5d9d4f8c8575aa97606444c28ed5.tar.gz chromium_src-cad78b03905d5d9d4f8c8575aa97606444c28ed5.tar.bz2 |
Update .gn .isolate files for VS 2015 DLLs
Component builds use CRT DLLs and the set of DLLs has changed
dramatically for VS 2015. This updates base/BUILD.gn to add the
necessary files to the .isolate file, including the Universal Windows
10 CRT files.
This is the .gn version of crrev.com/1676943002
BUG=440500
Review URL: https://codereview.chromium.org/1783973002
Cr-Commit-Position: refs/heads/master@{#380479}
Diffstat (limited to 'base/BUILD.gn')
-rw-r--r-- | base/BUILD.gn | 63 |
1 files changed, 59 insertions, 4 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn index f19c8f4..0b41b0e 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -36,6 +36,10 @@ if (is_android) { import("//build/config/android/rules.gni") } +if (is_win) { + import("//build/config/win/visual_studio_version.gni") +} + config("base_flags") { if (is_clang) { cflags = [ @@ -1162,10 +1166,61 @@ component("base") { # These runtime files are copied to the output directory by the # vs_toolchain script that runs as part of toolchain configuration. - data += [ - "$root_out_dir/msvcp120${vcrt_suffix}.dll", - "$root_out_dir/msvcr120${vcrt_suffix}.dll", - ] + if (visual_studio_version == "2015") { + data += [ + "$root_out_dir/msvcp140${vcrt_suffix}.dll", + "$root_out_dir/vccorlib140${vcrt_suffix}.dll", + "$root_out_dir/vcruntime140${vcrt_suffix}.dll", + + # Universal Windows 10 CRT files + "$root_out_dir/api-ms-win-core-console-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-datetime-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-debug-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-errorhandling-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-file-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-file-l1-2-0.dll", + "$root_out_dir/api-ms-win-core-file-l2-1-0.dll", + "$root_out_dir/api-ms-win-core-handle-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-heap-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-interlocked-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-libraryloader-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-localization-l1-2-0.dll", + "$root_out_dir/api-ms-win-core-memory-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-namedpipe-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-processenvironment-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-processthreads-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-processthreads-l1-1-1.dll", + "$root_out_dir/api-ms-win-core-profile-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-rtlsupport-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-string-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-synch-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-synch-l1-2-0.dll", + "$root_out_dir/api-ms-win-core-sysinfo-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-timezone-l1-1-0.dll", + "$root_out_dir/api-ms-win-core-util-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-conio-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-convert-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-environment-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-filesystem-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-heap-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-locale-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-math-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-multibyte-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-private-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-process-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-runtime-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-stdio-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-string-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-time-l1-1-0.dll", + "$root_out_dir/api-ms-win-crt-utility-l1-1-0.dll", + "$root_out_dir/ucrtbase${vcrt_suffix}.dll", + ] + } else { + data += [ + "$root_out_dir/msvcp120${vcrt_suffix}.dll", + "$root_out_dir/msvcr120${vcrt_suffix}.dll", + ] + } if (is_asan) { data += [ "//third_party/llvm-build/Release+Asserts/lib/clang/3.9.0/lib/windows/clang_rt.asan_dynamic-i386.dll" ] } |