summaryrefslogtreecommitdiffstats
path: root/chrome_elf
diff options
context:
space:
mode:
authorbrucedawson <brucedawson@chromium.org>2016-03-14 18:24:39 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-15 01:25:40 +0000
commit8b3670491a67a5ab16a3df58bfda60f0fb42afa2 (patch)
treee4a25e7a721c76b181084afbc36e5b9b437d3b7e /chrome_elf
parent48310b32694074ee74dc9861cac385596459bae8 (diff)
downloadchromium_src-8b3670491a67a5ab16a3df58bfda60f0fb42afa2.zip
chromium_src-8b3670491a67a5ab16a3df58bfda60f0fb42afa2.tar.gz
chromium_src-8b3670491a67a5ab16a3df58bfda60f0fb42afa2.tar.bz2
Update chrome_elf_unittests imports list for VS 2015
VS 2015 component builds import more DLLs so chrome_elf_unittests needs updating to reflect that. This change also tightens the restrictions on the import list - the CRT DLLs should only be needed in component builds. BUG=440500,594360 Review URL: https://codereview.chromium.org/1801953003 Cr-Commit-Position: refs/heads/master@{#381145}
Diffstat (limited to 'chrome_elf')
-rw-r--r--chrome_elf/elf_imports_unittest.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome_elf/elf_imports_unittest.cc b/chrome_elf/elf_imports_unittest.cc
index 946b9b5..c999932 100644
--- a/chrome_elf/elf_imports_unittest.cc
+++ b/chrome_elf/elf_imports_unittest.cc
@@ -77,7 +77,11 @@ TEST_F(ELFImportsTest, ChromeElfSanityCheck) {
static const char* const kValidFilePatterns[] = {
"KERNEL32.dll",
- "MSVC*",
+#if defined(COMPONENT_BUILD)
+ "MSVC*.dll",
+ "VCRUNTIME*.dll",
+ "api-ms-win-crt-*.dll",
+#endif
#if defined(SYZYASAN)
"syzyasan_rtl.dll",
#endif