diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 23:13:45 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 23:13:45 +0000 |
| commit | 3b33d16000bc6cd51d3934adb67ebeab4c546090 (patch) | |
| tree | c54e825203f52f0dd8721972a96fe57068847139 | |
| parent | f10d53e3d6dbd5c598c32a19edde00039c8498b2 (diff) | |
| download | chromium_src-3b33d16000bc6cd51d3934adb67ebeab4c546090.zip chromium_src-3b33d16000bc6cd51d3934adb67ebeab4c546090.tar.gz chromium_src-3b33d16000bc6cd51d3934adb67ebeab4c546090.tar.bz2 | |
fix incremental_chrome_dll shared build on windows
This patch applies patchset #2 from
https://chromiumcodereview.appspot.com/10121004/
and then removes the changes to content_switches.cc (which weren't
needed) and chrome_exe.gypi (which was not needed and was actually
bad because it caused chrome.exe to depend on content.dll ).
R=jam@chromium.org, vangelis@chromium.org, rogerta@chromium.org
BUG=none
TEST=local win build succeeds with incremental_chrome_dll = 1, all bots
remain green.
Review URL: https://chromiumcodereview.appspot.com/10166021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134008 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 8 | ||||
| -rw-r--r-- | chrome/chrome_installer_util.gypi | 2 | ||||
| -rw-r--r-- | content/content.gyp | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/build/common.gypi b/build/common.gypi index 3c2ba26..2b1cd40 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1220,14 +1220,6 @@ ['component=="shared_library"', { 'defines': ['COMPONENT_BUILD'], }], - ['component=="shared_library" and incremental_chrome_dll==1', { - # TODO(dpranke): 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. - # See http://code.google.com/p/chromium/issues/detail?id=98755 . - 'defines': ['COMPILE_CONTENT_STATICALLY'], - }], ['toolkit_views==1', { 'defines': ['TOOLKIT_VIEWS=1'], }], diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi index c82f981..c6ea69c 100644 --- a/chrome/chrome_installer_util.gypi +++ b/chrome/chrome_installer_util.gypi @@ -145,7 +145,7 @@ 'installer/util/shell_util.h', ], 'conditions': [ - ['component=="shared_library" and incremental_chrome_dll!=1', { + ['component=="shared_library"', { 'sources': [ '../content/public/common/content_switches.cc' ], 'defines': [ 'COMPILE_CONTENT_STATICALLY'], }, { diff --git a/content/content.gyp b/content/content.gyp index 846000c..6632f6d 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -22,7 +22,7 @@ # upstream unnecessarily (e.g., content_renderer depends on allocator # and chrome_exe depends on content_common but we don't want # chrome_exe to have to depend on allocator). - ['component=="static_library" or incremental_chrome_dll==1', { + ['component=="static_library"', { 'target_defines': [ 'COMPILE_CONTENT_STATICALLY', ], |