diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-18 19:08:32 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-18 19:08:32 +0000 |
| commit | a4a0bd9562e38ffff8aaf58031bdde0878ebfea4 (patch) | |
| tree | 71f1db142ccb47e734c540d4dfc1963629a96b25 /chrome/browser/browser.scons | |
| parent | 1849d01a855914348bbdc07c7674764daf549358 (diff) | |
| download | chromium_src-a4a0bd9562e38ffff8aaf58031bdde0878ebfea4.zip chromium_src-a4a0bd9562e38ffff8aaf58031bdde0878ebfea4.tar.gz chromium_src-a4a0bd9562e38ffff8aaf58031bdde0878ebfea4.tar.bz2 | |
Make startup_tests build and work on Mac.
Also ensure that Chromium.app quits properly between the tests.
http://crbug.com/8391
Review URL: http://codereview.chromium.org/42306
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.scons')
| -rw-r--r-- | chrome/browser/browser.scons | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 273355e..222f1e6 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -218,6 +218,8 @@ input_files = ChromeFileList([ 'automation/automation_provider.cc', 'automation/automation_provider.h', 'automation/automation_provider_list.cc', + 'automation/automation_provider_list_generic.cc', + 'automation/automation_provider_list_mac.mm', 'automation/automation_provider_list.h', 'automation/automation_resource_tracker.cc', 'automation/automation_resource_tracker.h', @@ -778,6 +780,12 @@ if env.Bit('mac'): 'tab_contents/web_contents_view.cc', ) +if not env.Bit('mac'): + # Mac-specific files + input_files.Remove( + 'automation/automation_provider_list_mac.mm', + ) + if env.Bit('windows'): env.TypeLibrary('history/history_indexer.idl') |