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

Side by Side Diff: app/app.gyp

Issue 6965007: Define os_posix in gyp files to get new Unix platforms added quickly (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: renamed to toolkit_uses_gtk and other fixes Created 9 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | app/app_base.gypi » ('j') | base/allocator/allocator.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'app_base.gypi', 10 'app_base.gypi',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 'sql/sqlite_features_unittest.cc', 50 'sql/sqlite_features_unittest.cc',
51 'sql/statement_unittest.cc', 51 'sql/statement_unittest.cc',
52 'sql/transaction_unittest.cc', 52 'sql/transaction_unittest.cc',
53 'test_suite.cc', 53 'test_suite.cc',
54 'test_suite.h', 54 'test_suite.h',
55 ], 55 ],
56 'include_dirs': [ 56 'include_dirs': [
57 '..', 57 '..',
58 ], 58 ],
59 'conditions': [ 59 'conditions': [
60 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 60 ['toolkit_uses_gtk==1', {
61 'sources': [ 61 'sources': [
62 '../ui/base/dragdrop/gtk_dnd_util_unittest.cc', 62 '../ui/base/dragdrop/gtk_dnd_util_unittest.cc',
63 ], 63 ],
64 'dependencies': [ 64 'dependencies': [
65 '../build/linux/system.gyp:gtk', 65 '../build/linux/system.gyp:gtk',
66 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 66 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
67 '../ui/base/strings/ui_strings.gyp:ui_unittest_strings', 67 '../ui/base/strings/ui_strings.gyp:ui_unittest_strings',
68 ], 68 ],
69 }], 69 }],
70 ['OS!="win"', { 70 ['OS!="win"', {
71 'sources!': [ 71 'sources!': [
72 '../ui/base/dragdrop/os_exchange_data_win_unittest.cc', 72 '../ui/base/dragdrop/os_exchange_data_win_unittest.cc',
73 '../ui/base/view_prop_unittest.cc', 73 '../ui/base/view_prop_unittest.cc',
74 ], 74 ],
75 }], 75 }],
76 ['OS =="linux" or OS =="freebsd"', { 76 ['os_posix==1 and OS!="mac"', {
77 'conditions': [ 77 'conditions': [
78 ['linux_use_tcmalloc==1', { 78 ['linux_use_tcmalloc==1', {
79 'dependencies': [ 79 'dependencies': [
80 '../base/allocator/allocator.gyp:allocator', 80 '../base/allocator/allocator.gyp:allocator',
81 ], 81 ],
82 }], 82 }],
83 ], 83 ],
84 }], 84 }],
85 ], 85 ],
86 }, 86 },
(...skipping 16 matching lines...) Expand all
103 'includes': [ '../build/grit_target.gypi' ], 103 'includes': [ '../build/grit_target.gypi' ],
104 }, 104 },
105 ], 105 ],
106 } 106 }
107 107
108 # Local Variables: 108 # Local Variables:
109 # tab-width:2 109 # tab-width:2
110 # indent-tabs-mode:nil 110 # indent-tabs-mode:nil
111 # End: 111 # End:
112 # vim: set expandtab tabstop=2 shiftwidth=2: 112 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | app/app_base.gypi » ('j') | base/allocator/allocator.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698