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

Unified Diff: chrome/chrome_browser_ui.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/chrome_browser.gypi ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 35471d8b77929143f7e48914330a243d9ba8a363..6da4b3728cb6877946d2a5af9125cd08766f8004 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -3271,12 +3271,8 @@
['exclude', '^browser/ui/webui/set_as_default_browser_ui.h'],
],
'conditions': [
- ['use_aura==1',{
+ ['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',
],
@@ -3285,6 +3281,7 @@
'<(INTERMEDIATE_DIR)/chrome',
],
'sources/': [
+ ['exclude', '^browser/ui/cocoa/*'],
['exclude', '^browser/ui/views/frame/app_panel_browser_frame_view.cc'],
['exclude', '^browser/ui/views/frame/app_panel_browser_frame_view.h'],
['exclude', '^browser/ui/views/uninstall_view.cc'],
@@ -3301,6 +3298,18 @@
['exclude', '^browser/ui/views/'],
]
}],
+ ],
+ }],
+ ['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',
+ ],
+ }],
# GTK build only
['toolkit_uses_gtk==1', {
'sources/': [
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698