diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 07:45:36 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-16 07:45:36 +0000 |
| commit | d7a2d89aee556017139f6bea76e328423e60277d (patch) | |
| tree | 018c1358276c3c551e888568f1a0e19ab840da25 /chrome/chrome_exe.gypi | |
| parent | ed522c341e491b8aad34f3ac2d9c06669971627e (diff) | |
| download | chromium_src-d7a2d89aee556017139f6bea76e328423e60277d.zip chromium_src-d7a2d89aee556017139f6bea76e328423e60277d.tar.gz chromium_src-d7a2d89aee556017139f6bea76e328423e60277d.tar.bz2 | |
Set up content in-process main threads via factory
This code was previously #ifdef'd out based on CHROME_MULTIPLE_DLL. This works
for chrome, but not for test targets which link content_browser. content_browser
needs to not link against child-only targets (as they'll cause linking blink
into the browser dll).
Instead of having utility_process_host_impl, et al. own the in-process
implementation, use a factory to create them that's installed in test code, and
in chrome for supporting --single-process.
At the same time, remove the global CHROME_MULTIPLE_DLL define and localize it
to chrome_exe.gypi because it's too easy to use incorrectly.
TBR=darin
R=piman@chromium.org,jam@chromium.org
BUG=237249
Review URL: https://chromiumcodereview.appspot.com/23235002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 78047eb..67b0efa 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -436,6 +436,9 @@ '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', ], }], + ['chrome_multiple_dll', { + 'defines': ['CHROME_MULTIPLE_DLL'], + }], ['OS=="mac" and asan==1', { 'xcode_settings': { # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE. |