diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 23:15:59 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 23:15:59 +0000 |
| commit | cab30871faac531e20f5c4e134d773d83c7a7281 (patch) | |
| tree | feae2cc2d6f41efc4886e1a4f690e74c618ed582 /chrome_elf/chrome_elf.gyp | |
| parent | 68d0eeb4f98c230419afda0ad2bdf6b576cde3c2 (diff) | |
| download | chromium_src-cab30871faac531e20f5c4e134d773d83c7a7281.zip chromium_src-cab30871faac531e20f5c4e134d773d83c7a7281.tar.gz chromium_src-cab30871faac531e20f5c4e134d773d83c7a7281.tar.bz2 | |
Reland of http://crrev.com/241548.
It broke on the main waterfall after going through the CQ. Two changes:
* No-op the loading test on 64-bit.
* Remove the 'IgnoreAllDefaultLibraries' directive. This seems to exclude
the CRT on some builders.
Original CL description:
Chrome browser process DLL blacklist.
This patch allows for blocking of module loading in the browser process.
It does not actually prevent any modules from loading.
Original Review URL: https://codereview.chromium.org/107663008
BUG=329023
TEST=chrome_elf_unittests.exe
TBR=cpu
Review URL: https://codereview.chromium.org/118343004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf/chrome_elf.gyp')
| -rw-r--r-- | chrome_elf/chrome_elf.gyp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp index cf0a0e9..7227fe6 100644 --- a/chrome_elf/chrome_elf.gyp +++ b/chrome_elf/chrome_elf.gyp @@ -8,6 +8,7 @@ 'includes': [ '../build/win_precompile.gypi', '../chrome/version.gypi', + 'blacklist.gypi', ], 'targets': [ { @@ -22,6 +23,7 @@ 'chrome_elf_main.h', ], 'dependencies': [ + 'blacklist', 'chrome_elf_lib', ], 'msvs_settings': { @@ -29,6 +31,12 @@ 'BaseAddress': '0x01c20000', # Set /SUBSYSTEM:WINDOWS for chrome_elf.dll (for consistency). 'SubSystem': '2', + 'AdditionalDependencies!': [ + 'user32.lib', + ], + 'IgnoreDefaultLibraryNames': [ + 'user32.lib', + ], }, }, }, @@ -36,6 +44,7 @@ 'target_name': 'chrome_elf_unittests', 'type': 'executable', 'sources': [ + 'blacklist/test/blacklist_test.cc', 'ntdll_cache_unittest.cc', ], 'include_dirs': [ @@ -43,8 +52,16 @@ ], 'dependencies': [ 'chrome_elf_lib', - '<(DEPTH)/base/base.gyp:run_all_unittests', - '<(DEPTH)/testing/gtest.gyp:gtest', + '../base/base.gyp:base', + '../base/base.gyp:run_all_unittests', + '../base/base.gyp:test_support_base', + '../sandbox/sandbox.gyp:sandbox', + '../testing/gtest.gyp:gtest', + 'blacklist', + 'blacklist_test_dll_1', + 'blacklist_test_dll_2', + 'blacklist_test_dll_3', + 'blacklist_test_main_dll', ], }, { |