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

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: Created 6 years, 5 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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 ['use_gio==1 and _toolset=="target"', { 533 ['use_gio==1 and _toolset=="target"', {
534 'cflags': [ 534 'cflags': [
535 '<!@(<(pkg-config) --cflags gio-2.0)', 535 '<!@(<(pkg-config) --cflags gio-2.0)',
536 ], 536 ],
537 'direct_dependent_settings': { 537 'direct_dependent_settings': {
538 'cflags': [ 538 'cflags': [
539 '<!@(<(pkg-config) --cflags gio-2.0)', 539 '<!@(<(pkg-config) --cflags gio-2.0)',
540 ], 540 ],
541 'defines': [ 541 'defines': [
542 'USE_GIO', 542 'USE_GIO',
543 # glib >=2.40 deprecate g_settings_list_schemas in favor of
Paweł Hajdan Jr. 2014/07/23 10:43:39 nit: Shouldn't this block be de-indented 2 spaces?
elecro 2014/07/23 13:13:51 Yeah, thanks missed that. CL rebased, and now wrap
544 # g_settings_schema_source_list_schemas. This function is not av ailable on
545 # earlier versions that we still need to support (specifically, 2.32), so
546 # disable the warning.
547 # TODO(mgiuca): Remove this suppression when we drop support for Ubuntu 13.10
548 # (saucy) and earlier. Update the code to use
549 # g_settings_schema_source_list_schemas instead.
550 'GLIB_DISABLE_DEPRECATION_WARNINGS',
543 ], 551 ],
544 'include_dirs': [ 552 'include_dirs': [
545 '<(SHARED_INTERMEDIATE_DIR)', 553 '<(SHARED_INTERMEDIATE_DIR)',
546 ], 554 ],
547 }, 555 },
548 'include_dirs': [ 556 'include_dirs': [
549 '../..', 557 '../..',
550 ], 558 ],
551 'link_settings': { 559 'link_settings': {
552 'ldflags': [ 560 'ldflags': [
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 ], 1048 ],
1041 'libraries': [ 1049 'libraries': [
1042 '<!@(<(pkg-config) --libs-only-l libudev)', 1050 '<!@(<(pkg-config) --libs-only-l libudev)',
1043 ], 1051 ],
1044 }, 1052 },
1045 }], 1053 }],
1046 ], 1054 ],
1047 }, 1055 },
1048 ], 1056 ],
1049 } 1057 }
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