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

Side by Side Diff: ui/ui.gyp

Issue 61923004: Clean up uses of use_glib that are not related to glib dependencies (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: desktop_linux == 1 or chromeos == 1 Created 7 years, 1 month 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 'sources/': [ 388 'sources/': [
389 ['exclude', 'base/dragdrop/drag_utils_aura.cc'], 389 ['exclude', 'base/dragdrop/drag_utils_aura.cc'],
390 ], 390 ],
391 }], 391 }],
392 ['use_glib == 1', { 392 ['use_glib == 1', {
393 'dependencies': [ 393 'dependencies': [
394 # font_gtk.cc uses fontconfig. 394 # font_gtk.cc uses fontconfig.
395 '../build/linux/system.gyp:fontconfig', 395 '../build/linux/system.gyp:fontconfig',
396 '../build/linux/system.gyp:glib', 396 '../build/linux/system.gyp:glib',
397 ], 397 ],
398 }],
399 ['desktop_linux == 1 or chromeos == 1', {
398 'conditions': [ 400 'conditions': [
399 ['toolkit_views==0 and use_aura==0', { 401 ['toolkit_views==0 and use_aura==0', {
400 # Note: because of gyp predence rules this has to be defined as 402 # Note: because of gyp predence rules this has to be defined as
401 # 'sources/' rather than 'sources!'. 403 # 'sources/' rather than 'sources!'.
402 'sources/': [ 404 'sources/': [
403 ['exclude', '^base/dragdrop/drag_utils.cc'], 405 ['exclude', '^base/dragdrop/drag_utils.cc'],
404 ['exclude', '^base/dragdrop/drag_utils.h'], 406 ['exclude', '^base/dragdrop/drag_utils.h'],
405 ['exclude', '^base/dragdrop/os_exchange_data.cc'], 407 ['exclude', '^base/dragdrop/os_exchange_data.cc'],
406 ['exclude', '^base/dragdrop/os_exchange_data.h'], 408 ['exclude', '^base/dragdrop/os_exchange_data.h'],
407 ], 409 ],
408 }, { 410 }, {
409 # Note: because of gyp predence rules this has to be defined as 411 # Note: because of gyp predence rules this has to be defined as
410 # 'sources/' rather than 'sources!'. 412 # 'sources/' rather than 'sources!'.
411 'sources/': [ 413 'sources/': [
412 ['include', '^base/dragdrop/os_exchange_data.cc'], 414 ['include', '^base/dragdrop/os_exchange_data.cc'],
413 ], 415 ],
414 }], 416 }],
415 ['use_pango==1', {
416 'dependencies': [
417 '../build/linux/system.gyp:pangocairo',
418 ],
419 }],
420 ], 417 ],
421 }], 418 }],
419 ['use_pango==1', {
420 'dependencies': [
421 '../build/linux/system.gyp:pangocairo',
422 ],
423 }],
422 ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', { 424 ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
423 'sources!': [ 425 'sources!': [
424 'base/clipboard/clipboard_aurax11.cc', 426 'base/clipboard/clipboard_aurax11.cc',
425 'base/dragdrop/os_exchange_data_provider_aurax11.cc', 427 'base/dragdrop/os_exchange_data_provider_aurax11.cc',
426 'base/touch/touch_device.cc', 428 'base/touch/touch_device.cc',
427 ], 429 ],
428 }, { 430 }, {
429 'sources!': [ 431 'sources!': [
430 'base/clipboard/clipboard_aura.cc', 432 'base/clipboard/clipboard_aura.cc',
431 'base/dragdrop/os_exchange_data_provider_aura.cc', 433 'base/dragdrop/os_exchange_data_provider_aura.cc',
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 'xcode_settings': { 723 'xcode_settings': {
722 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 724 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
723 }, 725 },
724 }], 726 }],
725 ], 727 ],
726 }, 728 },
727 ], 729 ],
728 }], 730 }],
729 ], 731 ],
730 } 732 }
OLDNEW
« base/base.gyp ('K') | « ui/message_center/message_center.gyp ('k') | ui/ui_unittests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698