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

Side by Side Diff: build/common.gypi

Issue 62173003: Linux: fix build with gnome-keyring on Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: trybots 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
« no previous file with comments | « no previous file | chrome/chrome_browser.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) 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 # doesn't agree with our BackingStore. 546 # doesn't agree with our BackingStore.
547 # TODO(beng): remove once skia text rendering is on by default. 547 # TODO(beng): remove once skia text rendering is on by default.
548 ['use_aura==1 and OS=="win"', { 548 ['use_aura==1 and OS=="win"', {
549 'enable_skia_text%': 1, 549 'enable_skia_text%': 1,
550 }], 550 }],
551 551
552 # A flag to enable or disable our compile-time dependency 552 # A flag to enable or disable our compile-time dependency
553 # on gnome-keyring. If that dependency is disabled, no gnome-keyring 553 # on gnome-keyring. If that dependency is disabled, no gnome-keyring
554 # support will be available. This option is useful 554 # support will be available. This option is useful
555 # for Linux distributions and for Aura. 555 # for Linux distributions and for Aura.
556 ['chromeos==1 or use_aura==1', { 556 ['OS!="linux" or chromeos==1 or use_aura==1', {
557 'use_gnome_keyring%': 0, 557 'use_gnome_keyring%': 0,
558 }, { 558 }, {
559 'use_gnome_keyring%': 1, 559 'use_gnome_keyring%': 1,
560 }], 560 }],
561 561
562 ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', { 562 ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', {
563 # GTK+, Mac and iOS want Title Case strings 563 # GTK+, Mac and iOS want Title Case strings
564 'use_titlecase_in_grd_files%': 1, 564 'use_titlecase_in_grd_files%': 1,
565 }], 565 }],
566 566
(...skipping 4163 matching lines...) Expand 10 before | Expand all | Expand 10 after
4730 # settings in target dicts. SYMROOT is a special case, because many other 4730 # settings in target dicts. SYMROOT is a special case, because many other
4731 # Xcode variables depend on it, including variables such as 4731 # Xcode variables depend on it, including variables such as
4732 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4732 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4733 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4733 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4734 # files to appear (when present) in the UI as actual files and not red 4734 # files to appear (when present) in the UI as actual files and not red
4735 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4735 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4736 # and therefore SYMROOT, needs to be set at the project level. 4736 # and therefore SYMROOT, needs to be set at the project level.
4737 'SYMROOT': '<(DEPTH)/xcodebuild', 4737 'SYMROOT': '<(DEPTH)/xcodebuild',
4738 }, 4738 },
4739 } 4739 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698