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/blacklist.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_elf/blacklist.gypi')
| -rw-r--r-- | chrome_elf/blacklist.gypi | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/chrome_elf/blacklist.gypi b/chrome_elf/blacklist.gypi new file mode 100644 index 0000000..ab5597d --- /dev/null +++ b/chrome_elf/blacklist.gypi @@ -0,0 +1,60 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'targets': [ + { + 'target_name': 'blacklist', + 'type': 'static_library', + 'sources': [ + 'blacklist/blacklist.cc', + 'blacklist/blacklist.h', + 'blacklist/blacklist_interceptions.cc', + 'blacklist/blacklist_interceptions.h', + ], + 'dependencies': [ + # Depend on base_static, but do NOT take a dependency on base.gyp:base + # as that would risk pulling in base's link-time dependencies which + # chrome_elf cannot do. + '../base/base.gyp:base_static', + '../sandbox/sandbox.gyp:sandbox', + ], + }, + { + 'target_name': 'blacklist_test_main_dll', + 'type': 'shared_library', + 'sources': [ + 'blacklist/test/blacklist_test_main_dll.cc', + 'blacklist/test/blacklist_test_main_dll.def', + ], + 'dependencies': [ + '../base/base.gyp:base', + 'blacklist', + ], + }, + { + 'target_name': 'blacklist_test_dll_1', + 'type': 'loadable_module', + 'sources': [ + 'blacklist/test/blacklist_test_dll_1.cc', + 'blacklist/test/blacklist_test_dll_1.def', + ], + }, + { + 'target_name': 'blacklist_test_dll_2', + 'type': 'loadable_module', + 'sources': [ + 'blacklist/test/blacklist_test_dll_2.cc', + 'blacklist/test/blacklist_test_dll_2.def', + ], + }, + { + 'target_name': 'blacklist_test_dll_3', + 'type': 'loadable_module', + 'sources': [ + 'blacklist/test/blacklist_test_dll_3.cc', + ], + }, + ], +} + |