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

Side by Side Diff: build/linux/system.gyp

Issue 367113004: Move GLIB_DISABLE_DEPRECATION_WARNINGS define to a more general place. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated Created 6 years, 4 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
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | net/proxy/proxy_config_service_linux.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) 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 'conditions': [ 7 'conditions': [
8 ['sysroot!=""', { 8 ['sysroot!=""', {
9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"', 9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"',
10 }, { 10 }, {
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 ], 560 ],
561 }, 561 },
562 { 562 {
563 'target_name': 'gio', 563 'target_name': 'gio',
564 'type': 'static_library', 564 'type': 'static_library',
565 'conditions': [ 565 'conditions': [
566 ['use_gio==1 and _toolset=="target"', { 566 ['use_gio==1 and _toolset=="target"', {
567 'cflags': [ 567 'cflags': [
568 '<!@(<(pkg-config) --cflags gio-2.0)', 568 '<!@(<(pkg-config) --cflags gio-2.0)',
569 ], 569 ],
570 'variables': {
571 'gio_warning_define': [
572 # glib >=2.40 deprecate g_settings_list_schemas in favor of
573 # g_settings_schema_source_list_schemas. This function is not
574 # available on earlier versions that we still need to support
575 # (specifically, 2.32), so disable the warning.
576 # TODO(mgiuca): Remove this suppression (and variable) when we
577 # drop support for Ubuntu 13.10 (saucy) and earlier. Update the
578 # code to use g_settings_schema_source_list_schemas instead.
579 'GLIB_DISABLE_DEPRECATION_WARNINGS',
580 ],
581 },
582 'defines': [
583 '<(gio_warning_define)',
584 ],
570 'direct_dependent_settings': { 585 'direct_dependent_settings': {
571 'cflags': [ 586 'cflags': [
572 '<!@(<(pkg-config) --cflags gio-2.0)', 587 '<!@(<(pkg-config) --cflags gio-2.0)',
573 ], 588 ],
574 'defines': [ 589 'defines': [
575 'USE_GIO', 590 'USE_GIO',
591 '<(gio_warning_define)',
576 ], 592 ],
577 'include_dirs': [ 593 'include_dirs': [
578 '<(SHARED_INTERMEDIATE_DIR)', 594 '<(SHARED_INTERMEDIATE_DIR)',
579 ], 595 ],
580 }, 596 },
581 'include_dirs': [ 597 'include_dirs': [
582 '../..', 598 '../..',
583 ], 599 ],
584 'link_settings': { 600 'link_settings': {
585 'ldflags': [ 601 'ldflags': [
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 '-Wno-header-guard', 1068 '-Wno-header-guard',
1053 ], 1069 ],
1054 }, 1070 },
1055 }], 1071 }],
1056 ] 1072 ]
1057 }], 1073 }],
1058 ], 1074 ],
1059 }, 1075 },
1060 ], 1076 ],
1061 } 1077 }
OLDNEW
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | net/proxy/proxy_config_service_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698