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/chrome_exe.gypi | |
| 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/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index abd63a3..c8f9cef 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -465,6 +465,8 @@ }], ['OS=="win"', { 'dependencies': [ + # Note that chrome_elf must be listed first. Do not reorder it. + '../chrome_elf/chrome_elf.gyp:chrome_elf', 'chrome_dll', 'chrome_nacl_win64', 'chrome_process_finder', @@ -474,7 +476,6 @@ '../base/base.gyp:base', '../breakpad/breakpad.gyp:breakpad_handler', '../breakpad/breakpad.gyp:breakpad_sender', - '../chrome_elf/chrome_elf.gyp:chrome_elf', '../components/components.gyp:breakpad_component', '../components/components.gyp:policy', '../sandbox/sandbox.gyp:sandbox', |