summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-16 22:55:17 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-16 22:55:17 +0000
commitcb6037d67847a6341eea166baf1d4051667a0b88 (patch)
tree2b766762057e96d758385b96e2a576d7b6690d54 /chrome/chrome.gyp
parentf9be34d622561d5599603b41d1c43d595e503426 (diff)
downloadchromium_src-cb6037d67847a6341eea166baf1d4051667a0b88.zip
chromium_src-cb6037d67847a6341eea166baf1d4051667a0b88.tar.gz
chromium_src-cb6037d67847a6341eea166baf1d4051667a0b88.tar.bz2
reland 31875. Revert was:
------ Revert 31875 to see whether it fixes reliability bot. BUG=25677 TEST=None ------ TBR=huanr Review URL: http://codereview.chromium.org/397017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rwxr-xr-xchrome/chrome.gyp23
1 files changed, 15 insertions, 8 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index a6a6270..8c9d107 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2124,6 +2124,8 @@
'browser/shell_integration_mac.mm',
'browser/shell_integration_linux.cc',
'browser/shell_integration_win.cc',
+ 'browser/spellcheck_host.cc',
+ 'browser/spellcheck_host.h',
'browser/spellcheck_worditerator.cc',
'browser/spellcheck_worditerator.h',
'browser/spellchecker.cc',
@@ -2566,8 +2568,6 @@
'sources': [
'browser/crash_handler_host_linux.h',
'browser/net/ssl_config_service_manager_pref.cc',
- 'browser/spellcheck_host.cc',
- 'browser/spellcheck_host.h',
],
'sources/': [
# Exclude most of printing.
@@ -3378,6 +3378,10 @@
'renderer/renderer_web_database_observer.h',
'renderer/socket_stream_dispatcher.cc',
'renderer/socket_stream_dispatcher.h',
+ 'renderer/spellchecker/spellcheck.cc',
+ 'renderer/spellchecker/spellcheck.h',
+ 'renderer/spellchecker/spellcheck_worditerator.cc',
+ 'renderer/spellchecker/spellcheck_worditerator.h',
'renderer/user_script_idle_scheduler.cc',
'renderer/user_script_idle_scheduler.h',
'renderer/user_script_slave.cc',
@@ -3414,12 +3418,6 @@
'../build/linux/system.gyp:gtk',
'../sandbox/sandbox.gyp:sandbox',
],
- 'sources': [
- 'renderer/spellchecker/spellcheck.cc',
- 'renderer/spellchecker/spellcheck.h',
- 'renderer/spellchecker/spellcheck_worditerator.cc',
- 'renderer/spellchecker/spellcheck_worditerator.h',
- ],
}],
# Windows-specific rules.
['OS=="win"', {
@@ -3433,6 +3431,15 @@
'../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
],
},],
+ # Mac-specific rules.
+ ['OS=="mac"', {
+ 'sources!': [
+ 'renderer/spellchecker/spellcheck.cc',
+ 'renderer/spellchecker/spellcheck.h',
+ 'renderer/spellchecker/spellcheck_worditerator.cc',
+ 'renderer/spellchecker/spellcheck_worditerator.h',
+ ],
+ },],
],
},
{