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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/config/win/msvs_dependencies.isolate

Issue 1676943002: Copy the Universal CRT files to the output dirs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR changes and CRLF to LF fixes Created 4 years, 10 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/vs_toolchain.py » ('j') | build/vs_toolchain.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/win/msvs_dependencies.isolate
diff --git a/build/config/win/msvs_dependencies.isolate b/build/config/win/msvs_dependencies.isolate
index 6814b43f9717e8f4cb8c2a6a83b8bb67b300f1d5..061a89789ab34ec82755845b84db02851d19a977 100644
--- a/build/config/win/msvs_dependencies.isolate
+++ b/build/config/win/msvs_dependencies.isolate
@@ -45,6 +45,8 @@
'files': [
'<(PRODUCT_DIR)/x64/msvcp140d.dll',
'<(PRODUCT_DIR)/x64/vccorlib140d.dll',
+ '<(PRODUCT_DIR)/x64/vcruntime140d.dll',
+ '<(PRODUCT_DIR)/x64/ucrtbased.dll',
],
},
}],
@@ -53,6 +55,8 @@
'files': [
'<(PRODUCT_DIR)/x64/msvcp140.dll',
'<(PRODUCT_DIR)/x64/vccorlib140.dll',
+ '<(PRODUCT_DIR)/x64/vcruntime140.dll',
+ '<(PRODUCT_DIR)/x64/ucrtbase.dll',
],
},
}],
@@ -61,6 +65,8 @@
'files': [
'<(PRODUCT_DIR)/msvcp140d.dll',
'<(PRODUCT_DIR)/vccorlib140d.dll',
+ '<(PRODUCT_DIR)/vcruntime140d.dll',
+ '<(PRODUCT_DIR)/ucrtbased.dll',
],
},
}],
@@ -69,8 +75,106 @@
'files': [
'<(PRODUCT_DIR)/msvcp140.dll',
'<(PRODUCT_DIR)/vccorlib140.dll',
+ '<(PRODUCT_DIR)/vcruntime140.dll',
+ '<(PRODUCT_DIR)/ucrtbase.dll',
],
},
}],
+ ['OS=="win" and msvs_version==2015 and component=="shared_library" and target_arch=="ia32"', {
+ # 32-bit builds have an x64 directory which also needs Windows 10
+ # Universal C Runtime binaries copied over.
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-console-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-datetime-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-debug-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-errorhandling-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-file-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-file-l1-2-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-file-l2-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-handle-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-heap-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-interlocked-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-libraryloader-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-localization-l1-2-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-memory-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-namedpipe-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-processenvironment-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-processthreads-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-processthreads-l1-1-1.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-profile-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-rtlsupport-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-string-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-synch-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-synch-l1-2-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-sysinfo-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-timezone-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-core-util-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-conio-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-convert-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-environment-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-filesystem-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-heap-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-locale-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-math-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-multibyte-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-private-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-process-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-runtime-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-stdio-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-string-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-time-l1-1-0.dll',
+ '<(PRODUCT_DIR)/x64/api-ms-win-crt-utility-l1-1-0.dll',
+ ],
+ },
+ }],
+ ['OS=="win" and msvs_version==2015 and component=="shared_library"', {
+ # Windows 10 Universal C Runtime binaries.
+ 'variables': {
+ 'files': [
+ '<(PRODUCT_DIR)/api-ms-win-core-console-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-datetime-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-debug-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-errorhandling-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-file-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-file-l1-2-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-file-l2-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-handle-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-heap-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-interlocked-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-libraryloader-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-localization-l1-2-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-memory-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-namedpipe-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-processenvironment-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-processthreads-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-processthreads-l1-1-1.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-profile-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-rtlsupport-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-string-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-synch-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-synch-l1-2-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-sysinfo-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-timezone-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-core-util-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-conio-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-convert-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-environment-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-filesystem-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-heap-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-locale-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-math-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-multibyte-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-private-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-process-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-runtime-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-stdio-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-string-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-time-l1-1-0.dll',
+ '<(PRODUCT_DIR)/api-ms-win-crt-utility-l1-1-0.dll',
+ ],
+ },
+ }],
+
Nico 2016/02/09 01:13:37 EMPTY LINE
brucedawson 2016/02/09 01:38:56 Done. In a separate CL.
],
}
« no previous file with comments | « no previous file | build/vs_toolchain.py » ('j') | build/vs_toolchain.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698