diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 21:55:18 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 21:55:18 +0000 |
| commit | 5cba9ff723227ca847c8cb4186be45ea903f9794 (patch) | |
| tree | 3eb4776e934e7a7fb3a007a80bb08f549b0368d6 /chrome/chrome_installer_util.gypi | |
| parent | 1562042283de1138d4386d1fea05d9028fbc8b0c (diff) | |
| download | chromium_src-5cba9ff723227ca847c8cb4186be45ea903f9794.zip chromium_src-5cba9ff723227ca847c8cb4186be45ea903f9794.tar.gz chromium_src-5cba9ff723227ca847c8cb4186be45ea903f9794.tar.bz2 | |
Enable content component (again!).
This version fixes a problem with the windows incremental linking build. We can't incrementally link chrome when content is being built as a DLL because chrome links in webkit_glue and webkit_glue depends on symbols defined in content. We can remove this when we fix glue.
R=jam@chromium.org
BUG=90442, 98755.
Review URL: http://codereview.chromium.org/8570024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer_util.gypi')
| -rw-r--r-- | chrome/chrome_installer_util.gypi | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi index f6bbe07..95bb537 100644 --- a/chrome/chrome_installer_util.gypi +++ b/chrome/chrome_installer_util.gypi @@ -97,13 +97,13 @@ }, 'dependencies': [ 'installer_util_strings', - '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', 'common_constants', 'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_strings', - '../content/content.gyp:content_common', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', + '<(DEPTH)/content/content.gyp:content_common', '<(DEPTH)/courgette/courgette.gyp:courgette_lib', '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch', '<(DEPTH)/third_party/icu/icu.gyp:icui18n', @@ -141,6 +141,14 @@ 'installer/util/shell_util.cc', 'installer/util/shell_util.h', ], + 'conditions': [ + ['component=="shared_library" and incremental_chrome_dll!=1', { + 'sources': [ '../content/public/common/content_switches.cc' ], + 'defines': [ 'COMPILE_CONTENT_STATICALLY'], + }, { + 'dependencies': ['<(DEPTH)/content/content.gyp:content_common'], + }], + ], }, { 'target_name': 'installer_util_nacl_win64', @@ -186,8 +194,15 @@ 'include_dirs': [ '<(DEPTH)', ], + 'conditions': [ + ['component == "shared_library"', { + 'sources': [ '../content/public/common/content_switches.cc' ], + 'defines': [ 'COMPILE_CONTENT_STATICALLY'], + }], + ], } ], }], + ], } |