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

Unified Diff: app/app_base.gypi

Issue 1741010: gyp: unify toolkit_views usage (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | build/all.gyp » ('j') | chrome/chrome_exe.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/app_base.gypi
diff --git a/app/app_base.gypi b/app/app_base.gypi
index f046e2c3022ff2d36542eddea556cb057a9a8933..0c68721443ce175034c57abf2e1ba4501e7c7506 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -209,7 +209,7 @@
'../build/linux/system.gyp:x11',
],
'conditions': [
- ['toolkit_views==0 and chromeos==0', {
+ ['toolkit_views==0', {
# Note: because of gyp predence rules this has to be defined as
# 'sources/' rather than 'sources!'.
'sources/': [
@@ -220,7 +220,7 @@
['exclude', '^drag_drop_types_gtk.cc'],
],
}],
- ['toolkit_views==1 or chromeos==1', {
+ ['toolkit_views==1', {
# Note: because of gyp predence rules this has to be defined as
# 'sources/' rather than 'sources!'.
'sources/': [
« no previous file with comments | « no previous file | build/all.gyp » ('j') | chrome/chrome_exe.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698