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

Unified Diff: chrome/chrome.gyp

Issue 262027: include CHROMEOS files and defintions in TOOLKIT_VEIWS build.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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/browser/views/tabs/tab_overview_message_listener.cc ('k') | chrome/installer/installer.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 28714)
+++ chrome/chrome.gyp (working copy)
@@ -342,7 +342,7 @@
'build', '-o', '<(grit_out_dir)',
'-D', '<(chrome_build)'],
'conditions': [
- ['chromeos==1', {
+ ['chromeos==1 or toolkit_views==1', {
'action': ['-D', 'chromeos'],
}],
['use_titlecase_in_grd_files==1', {
@@ -399,7 +399,7 @@
'-D', '<(chrome_build)'
],
'conditions': [
- ['chromeos==1', {
+ ['chromeos==1 or toolkit_views==1', {
'action': ['-D', 'chromeos'],
}],
['use_titlecase_in_grd_files==1', {
@@ -2363,7 +2363,7 @@
'CHROME_V8',
],
}],
- ['chromeos==0', {
+ ['chromeos==0 and toolkit_views==0', {
'sources/': [
['exclude', '^browser/chromeos'],
],
@@ -2809,7 +2809,7 @@
['include', '^browser/printing/print_dialog_gtk.h'],
],
}],
- ['chromeos==1',{
+ ['chromeos==1 or toolkit_views==1',{
'dependencies': [
'../third_party/protobuf2/protobuf.gyp:protobuf_lite',
'../third_party/protobuf2/protobuf.gyp:protoc',
@@ -4427,7 +4427,7 @@
'../third_party/cld/bar/toolbar/cld/i18n/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
],
'conditions': [
- ['chromeos==0', {
+ ['chromeos==0 and toolkit_views==0', {
'sources/': [
['exclude', '^browser/chromeos'],
],
« no previous file with comments | « chrome/browser/views/tabs/tab_overview_message_listener.cc ('k') | chrome/installer/installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698