diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 01:50:30 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 01:50:30 +0000 |
| commit | 0be7b2bcef865fce63698c9aa819ed1e7ea8335a (patch) | |
| tree | 4ba34efc6a61643c31013390ebda148263533a68 /content | |
| parent | 646ba08f4744ee33d5930a77e0a7a99cf4944c51 (diff) | |
| download | chromium_src-0be7b2bcef865fce63698c9aa819ed1e7ea8335a.zip chromium_src-0be7b2bcef865fce63698c9aa819ed1e7ea8335a.tar.gz chromium_src-0be7b2bcef865fce63698c9aa819ed1e7ea8335a.tar.bz2 | |
Link startup_helper_win statically to force InitializeSandboxInfo
to use the sandbox library linked statically into an executable;
using a sandbox library linked into content.dll doesn't work on
windows.
R=jam@chromium.org
BUG=90442
TEST=
Review URL: http://codereview.chromium.org/8233039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/app/startup_helper_win.h | 10 | ||||
| -rw-r--r-- | content/content_shell.gypi | 2 | ||||
| -rw-r--r-- | content/content_tests.gypi | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/content/app/startup_helper_win.h b/content/app/startup_helper_win.h index b870798..e20b638 100644 --- a/content/app/startup_helper_win.h +++ b/content/app/startup_helper_win.h @@ -6,8 +6,6 @@ #define CONTENT_APP_STARTUP_HELPER_WIN_H_ #pragma once -#include "content/common/content_export.h" - class CommandLine; namespace sandbox { @@ -18,9 +16,11 @@ struct SandboxInterfaceInfo; // will want to call at startup. namespace content { -// Initializes the sandbox code and turns on DEP. -CONTENT_EXPORT void InitializeSandboxInfo( - sandbox::SandboxInterfaceInfo* sandbox_info); +// Initializes the sandbox code and turns on DEP. Note: This function +// must be *statically* linked into the executable (along with the static +// sandbox library); it will not work correctly if it is exported from a +// DLL and linked in. +void InitializeSandboxInfo(sandbox::SandboxInterfaceInfo* sandbox_info); // Register the invalid param handler and pure call handler to be able to // notify breakpad when it happens. diff --git a/content/content_shell.gypi b/content/content_shell.gypi index c818460..9709e15 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -113,11 +113,13 @@ }, 'dependencies': [ 'content_shell_lib', + '../sandbox/sandbox.gyp:sandbox', ], 'include_dirs': [ '..', ], 'sources': [ + 'app/startup_helper_win.cc', 'shell/shell_main.cc', ], 'msvs_settings': { diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 3dd46d5..d991253 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -100,6 +100,7 @@ '../ipc/ipc.gyp:test_support_ipc', '../media/media.gyp:media_test_support', '../net/net.gyp:net_test_support', + '../sandbox/sandbox.gyp:sandbox', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -114,6 +115,7 @@ '..', ], 'sources': [ + 'app/startup_helper_win.cc', 'browser/appcache/chrome_appcache_service_unittest.cc', 'browser/browser_thread_unittest.cc', 'browser/browser_url_handler_unittest.cc', @@ -229,6 +231,7 @@ 'test_support_content', '../base/base.gyp:test_support_base', '../net/net.gyp:net_test_support', + '../sandbox/sandbox.gyp:sandbox', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../ui/ui.gyp:ui', @@ -241,6 +244,7 @@ 'HAS_OUT_OF_PROC_TEST_RUNNER', ], 'sources': [ + 'app/startup_helper_win.cc', 'test/content_browser_test.h', 'test/content_browser_test.cc', 'test/content_test_launcher.cc', |