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

Side by Side Diff: base/base.gyp

Issue 606075: Second set adding in Solaris as an OS option (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 10 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 | base/file_util_posix.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'base.gypi', 10 'base.gypi',
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 # #include for unicode/uchar.h. This should probably be cleaned up. 142 # #include for unicode/uchar.h. This should probably be cleaned up.
143 '../third_party/icu/public/common', 143 '../third_party/icu/public/common',
144 ], 144 ],
145 'dependencies': [ 145 'dependencies': [
146 'base', 146 'base',
147 'base_i18n', 147 'base_i18n',
148 '../testing/gmock.gyp:gmock', 148 '../testing/gmock.gyp:gmock',
149 '../testing/gtest.gyp:gtest', 149 '../testing/gtest.gyp:gtest',
150 ], 150 ],
151 'conditions': [ 151 'conditions': [
152 ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 152 ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris" ', {
153 'sources!': [ 153 'sources!': [
154 'file_version_info_unittest.cc', 154 'file_version_info_unittest.cc',
155 'worker_pool_linux_unittest.cc', 155 'worker_pool_linux_unittest.cc',
156 ], 156 ],
157 'conditions': [ 157 'conditions': [
158 [ 'linux_use_tcmalloc==1', { 158 [ 'linux_use_tcmalloc==1', {
159 'dependencies': [ 159 'dependencies': [
160 'allocator/allocator.gyp:allocator', 160 'allocator/allocator.gyp:allocator',
161 ], 161 ],
162 }, 162 },
163 ], 163 ],
164 ], 164 ],
165 'dependencies': [ 165 'dependencies': [
166 '../build/linux/system.gyp:gtk', 166 '../build/linux/system.gyp:gtk',
167 '../build/linux/system.gyp:nss', 167 '../build/linux/system.gyp:nss',
168 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 168 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
169 ], 169 ],
170 }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" 170 }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
171 'sources!': [ 171 'sources!': [
172 'message_pump_glib_unittest.cc', 172 'message_pump_glib_unittest.cc',
173 ] 173 ]
174 }], 174 }],
175 # This is needed to trigger the dll copy step on windows. 175 # This is needed to trigger the dll copy step on windows.
176 # TODO(mark): This should not be necessary. 176 # TODO(mark): This should not be necessary.
177 ['OS == "win"', { 177 ['OS == "win"', {
178 'dependencies': [ 178 'dependencies': [
179 '../third_party/icu/icu.gyp:icudata', 179 '../third_party/icu/icu.gyp:icudata',
180 ], 180 ],
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 'sources': [ 223 'sources': [
224 'perftimer.cc', 224 'perftimer.cc',
225 'test/run_all_perftests.cc', 225 'test/run_all_perftests.cc',
226 ], 226 ],
227 'direct_dependent_settings': { 227 'direct_dependent_settings': {
228 'defines': [ 228 'defines': [
229 'PERF_TEST', 229 'PERF_TEST',
230 ], 230 ],
231 }, 231 },
232 'conditions': [ 232 'conditions': [
233 ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 233 ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris" ', {
234 'dependencies': [ 234 'dependencies': [
235 # Needed to handle the #include chain: 235 # Needed to handle the #include chain:
236 # base/test/perf_test_suite.h 236 # base/test/perf_test_suite.h
237 # base/test/test_suite.h 237 # base/test/test_suite.h
238 # gtk/gtk.h 238 # gtk/gtk.h
239 '../build/linux/system.gyp:gtk', 239 '../build/linux/system.gyp:gtk',
240 ], 240 ],
241 }], 241 }],
242 ], 242 ],
243 }, 243 },
244 ], 244 ],
245 'conditions': [ 245 'conditions': [
246 [ 'OS == "win"', { 246 [ 'OS == "win"', {
247 'targets': [ 247 'targets': [
248 { 248 {
249 'target_name': 'debug_message', 249 'target_name': 'debug_message',
250 'type': 'executable', 250 'type': 'executable',
251 'sources': [ 251 'sources': [
252 'debug_message.cc', 252 'debug_message.cc',
253 ], 253 ],
254 'msvs_settings': { 254 'msvs_settings': {
255 'VCLinkerTool': { 255 'VCLinkerTool': {
256 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 256 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
257 }, 257 },
258 }, 258 },
259 }, 259 },
260 ], 260 ],
261 }], 261 }],
262 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 262 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
263 'targets': [ 263 'targets': [
264 { 264 {
265 'target_name': 'linux_versioninfo', 265 'target_name': 'linux_versioninfo',
266 'type': '<(library)', 266 'type': '<(library)',
267 'sources': [ 267 'sources': [
268 'file_version_info_linux.cc', 268 'file_version_info_linux.cc',
269 ], 269 ],
270 'include_dirs': [ 270 'include_dirs': [
271 '..', 271 '..',
272 '<(SHARED_INTERMEDIATE_DIR)', 272 '<(SHARED_INTERMEDIATE_DIR)',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 ], 319 ],
320 }], 320 }],
321 ], 321 ],
322 } 322 }
323 323
324 # Local Variables: 324 # Local Variables:
325 # tab-width:2 325 # tab-width:2
326 # indent-tabs-mode:nil 326 # indent-tabs-mode:nil
327 # End: 327 # End:
328 # vim: set expandtab tabstop=2 shiftwidth=2: 328 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | base/file_util_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698