diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 21:01:09 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 21:01:09 +0000 |
| commit | 0a670edfacc27f9d1ec85c2764bc81a955ab15f8 (patch) | |
| tree | d6577ddaa8ad90bc030776e64f6b42c4b58c2a50 /chrome/default_plugin | |
| parent | a733898942fc96ec09b7ddacef6152051390317f (diff) | |
| download | chromium_src-0a670edfacc27f9d1ec85c2764bc81a955ab15f8.zip chromium_src-0a670edfacc27f9d1ec85c2764bc81a955ab15f8.tar.gz chromium_src-0a670edfacc27f9d1ec85c2764bc81a955ab15f8.tar.bz2 | |
Revert 99810 - Get the rest of the chrome target to build (but not link) with USE_AURA.
http://crbug.com/93947
TEST=none
Review URL: http://codereview.chromium.org/7839002
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/7840010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/default_plugin')
| -rw-r--r-- | chrome/default_plugin/default_plugin.gyp | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/chrome/default_plugin/default_plugin.gyp b/chrome/default_plugin/default_plugin.gyp index bb73479..1b89034 100644 --- a/chrome/default_plugin/default_plugin.gyp +++ b/chrome/default_plugin/default_plugin.gyp @@ -38,31 +38,25 @@ 'plugin_main.h', ], 'conditions': [ - ['use_aura==1', { - 'sources/': [ - ['exclude', '^plugin_impl_win.cc'], - ['exclude', '^plugin_impl_win.h'], - ], - }], - ['OS=="win"', { - 'link_settings': { - 'libraries': ['-lurlmon.lib'], - }, - 'sources': [ - 'default_plugin_resources.h', - 'install_dialog.cc', - 'install_dialog.h', - 'plugin_database_handler.cc', - 'plugin_database_handler.h', - 'plugin_install_job_monitor.cc', - 'plugin_install_job_monitor.h', - ], - }], - ['toolkit_uses_gtk == 1', { - 'dependencies': [ - '<(DEPTH)/build/linux/system.gyp:gtk', - ], - }], + ['OS=="win"', { + 'link_settings': { + 'libraries': ['-lurlmon.lib'], + }, + 'sources': [ + 'default_plugin_resources.h', + 'install_dialog.cc', + 'install_dialog.h', + 'plugin_database_handler.cc', + 'plugin_database_handler.h', + 'plugin_install_job_monitor.cc', + 'plugin_install_job_monitor.h', + ], + }], + ['toolkit_uses_gtk == 1', { + 'dependencies': [ + '<(DEPTH)/build/linux/system.gyp:gtk', + ], + }], ], }, # This can't be part of chrome.gyp:chrome_resources because then there'd |