Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7672)

Unified Diff: chrome/chrome_browser.gypi

Issue 110283005: Make aura_demo work on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix resolve Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698