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

Side by Side Diff: base/base.gyp

Issue 7904034: aura: Explicitly disable GTK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 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/base.gypi » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 'file_version_info_unittest.cc', 137 'file_version_info_unittest.cc',
138 'gmock_unittest.cc', 138 'gmock_unittest.cc',
139 'id_map_unittest.cc', 139 'id_map_unittest.cc',
140 'i18n/break_iterator_unittest.cc', 140 'i18n/break_iterator_unittest.cc',
141 'i18n/char_iterator_unittest.cc', 141 'i18n/char_iterator_unittest.cc',
142 'i18n/case_conversion_unittest.cc', 142 'i18n/case_conversion_unittest.cc',
143 'i18n/file_util_icu_unittest.cc', 143 'i18n/file_util_icu_unittest.cc',
144 'i18n/icu_string_conversions_unittest.cc', 144 'i18n/icu_string_conversions_unittest.cc',
145 'i18n/number_formatting_unittest.cc', 145 'i18n/number_formatting_unittest.cc',
146 'i18n/rtl_unittest.cc', 146 'i18n/rtl_unittest.cc',
147 » 'i18n/string_search_unittest.cc', 147 'i18n/string_search_unittest.cc',
148 'i18n/time_formatting_unittest.cc', 148 'i18n/time_formatting_unittest.cc',
149 'json/json_reader_unittest.cc', 149 'json/json_reader_unittest.cc',
150 'json/json_writer_unittest.cc', 150 'json/json_writer_unittest.cc',
151 'json/string_escape_unittest.cc', 151 'json/string_escape_unittest.cc',
152 'lazy_instance_unittest.cc', 152 'lazy_instance_unittest.cc',
153 'linked_list_unittest.cc', 153 'linked_list_unittest.cc',
154 'logging_unittest.cc', 154 'logging_unittest.cc',
155 'mac/mac_util_unittest.mm', 155 'mac/mac_util_unittest.mm',
156 'mac/objc_property_releaser_unittest.mm', 156 'mac/objc_property_releaser_unittest.mm',
157 'md5_unittest.cc', 157 'md5_unittest.cc',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 '../testing/gtest.gyp:gtest', 250 '../testing/gtest.gyp:gtest',
251 '../third_party/icu/icu.gyp:icui18n', 251 '../third_party/icu/icu.gyp:icui18n',
252 '../third_party/icu/icu.gyp:icuuc', 252 '../third_party/icu/icu.gyp:icuuc',
253 ], 253 ],
254 'includes': ['../build/nocompile.gypi'], 254 'includes': ['../build/nocompile.gypi'],
255 'variables': { 255 'variables': {
256 # TODO(ajwong): Is there a way to autodetect this? 256 # TODO(ajwong): Is there a way to autodetect this?
257 'module_dir': 'base' 257 'module_dir': 'base'
258 }, 258 },
259 'conditions': [ 259 'conditions': [
260 ['toolkit_uses_gtk==1', { 260 ['use_glib==1', {
261 'sources!': [ 261 'sources!': [
262 'file_version_info_unittest.cc', 262 'file_version_info_unittest.cc',
263 ], 263 ],
264 'sources': [
265 'nix/xdg_util_unittest.cc',
266 ],
267 'conditions': [ 264 'conditions': [
268 [ 'linux_use_tcmalloc==1', { 265 [ 'linux_use_tcmalloc==1', {
269 'dependencies': [ 266 'dependencies': [
270 'allocator/allocator.gyp:allocator', 267 'allocator/allocator.gyp:allocator',
271 ], 268 ],
272 }, 269 },
273 ], 270 ],
274 ['gcc_version==44', { 271 ['gcc_version==44', {
275 # Avoid gcc 4.4 strict aliasing issues in stl_tree.h when 272 # Avoid gcc 4.4 strict aliasing issues in stl_tree.h when
276 # building mru_cache_unittest.cc. 273 # building mru_cache_unittest.cc.
277 'cflags': [ 274 'cflags': [
278 '-fno-strict-aliasing', 275 '-fno-strict-aliasing',
279 ], 276 ],
280 }], 277 }],
278 [ 'toolkit_uses_gtk==1', {
279 'sources': [
280 'nix/xdg_util_unittest.cc',
281 ],
282 'dependencies': [
283 '../build/linux/system.gyp:gtk',
284 ]
285 }],
281 ], 286 ],
282 'dependencies': [ 287 'dependencies': [
283 '../build/linux/system.gyp:gtk', 288 '../build/linux/system.gyp:glib',
284 '../build/linux/system.gyp:ssl', 289 '../build/linux/system.gyp:ssl',
285 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 290 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
286 ], 291 ],
287 }, { # toolkit_uses_gtk!=1 292 }, { # use_glib!=1
288 'sources!': [ 293 'sources!': [
289 'message_pump_glib_unittest.cc', 294 'message_pump_glib_unittest.cc',
290 ] 295 ]
291 }], 296 }],
292 # This is needed to trigger the dll copy step on windows. 297 # This is needed to trigger the dll copy step on windows.
293 # TODO(mark): This should not be necessary. 298 # TODO(mark): This should not be necessary.
294 ['OS == "win"', { 299 ['OS == "win"', {
295 'dependencies': [ 300 'dependencies': [
296 '../third_party/icu/icu.gyp:icudata', 301 '../third_party/icu/icu.gyp:icudata',
297 ], 302 ],
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 'msvs_settings': { 418 'msvs_settings': {
414 'VCLinkerTool': { 419 'VCLinkerTool': {
415 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 420 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
416 }, 421 },
417 }, 422 },
418 }, 423 },
419 ], 424 ],
420 }], 425 }],
421 ], 426 ],
422 } 427 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698