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

Unified Diff: chrome/chrome_browser.gypi

Issue 1799002: Fix the toolkit_views gyp variable define mania. (Closed)
Patch Set: build fix Created 10 years, 8 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
« build/common.gypi ('K') | « build/common.gypi ('k') | no next file » | 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 f358fe8522d9c7f1be14863e2e1b66c49b216bf7..c26b345b8b9cb8aeea02aa8693837f62ca506aff 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3078,7 +3078,10 @@
['exclude', '^browser/browser_list_gtk.cc'],
],
}],
- ['OS=="linux" and toolkit_views==1', {
+ # These GTK files haven't been ported to views, while ChromeOS has
+ # its own separate implementation below. So re-include them only on
+ # non-ChromeOS views Linux builds.
+ ['OS=="linux" and chromeos==0 and toolkit_views==1', {
'sources/': [
['include', '^browser/gtk/dialogs_gtk.cc'],
['include', '^browser/gtk/external_protocol_dialog_gtk.cc'],
« build/common.gypi ('K') | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698