| Index: chrome/chrome_browser.gypi
|
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
|
| index e07f8cdd1517d4f5c1cb663ee6564307673a8f19..22285c08f441428a89e9ad308b74d1828885facc 100644
|
| --- a/chrome/chrome_browser.gypi
|
| +++ b/chrome/chrome_browser.gypi
|
| @@ -3339,7 +3339,7 @@
|
| }],
|
| ],
|
| }, { # 'OS!="win"
|
| - 'sources/': [
|
| + 'sources/': [
|
| # Exclude files that should be excluded for all non-Windows platforms.
|
| ['exclude', '^browser/first_run/try_chrome_dialog_view.cc'],
|
| ['exclude', '^browser/first_run/try_chrome_dialog_view.h'],
|
| @@ -3350,10 +3350,6 @@
|
| 'conditions': [
|
| ['use_aura==1', {
|
| 'dependencies': [
|
| - '../build/linux/system.gyp:dbus',
|
| - '../build/linux/system.gyp:fontconfig',
|
| - '../build/linux/system.gyp:x11',
|
| - '../dbus/dbus.gyp:dbus',
|
| '../ui/views/controls/webview/webview.gyp:webview',
|
| '../ui/views/views.gyp:views',
|
| ],
|
| @@ -3362,17 +3358,10 @@
|
| '<(INTERMEDIATE_DIR)/chrome',
|
| ],
|
| 'sources/': [
|
| - ['exclude', '^browser/platform_util_common_linux.cc'],
|
| ['include', '^browser/printing/print_dialog_cloud.cc'],
|
| ['include', '^browser/printing/print_dialog_cloud.h'],
|
| ],
|
| }],
|
| - # GTK build only
|
| - ['toolkit_uses_gtk==1', {
|
| - 'sources/': [
|
| - ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
|
| - ],
|
| - }],
|
| ['gcc_version == 45', {
|
| # Avoid gcc 4.5 miscompilation of template_url.cc
|
| # as per http://crbug.com/41887
|
| @@ -3382,6 +3371,27 @@
|
| }],
|
| ],
|
| }],
|
| + ['OS=="linux"', {
|
| + 'conditions': [
|
| + ['use_aura==1', {
|
| + 'dependencies': [
|
| + '../build/linux/system.gyp:dbus',
|
| + '../build/linux/system.gyp:fontconfig',
|
| + '../build/linux/system.gyp:x11',
|
| + '../dbus/dbus.gyp:dbus',
|
| + ],
|
| + 'sources/': [
|
| + ['exclude', '^browser/platform_util_common_linux.cc'],
|
| + ],
|
| + }],
|
| + # GTK build only
|
| + ['toolkit_uses_gtk==1', {
|
| + 'sources/': [
|
| + ['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
|
| + ],
|
| + }],
|
| + ],
|
| + }],
|
| ['enable_plugin_installation==0', {
|
| 'sources!': [
|
| 'browser/plugins/plugin_installer.cc',
|
|
|