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

Side by Side Diff: build/common.gypi

Issue 171583002: linux_aura: Default use_gnome_keyring% to on when use_aura=1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Link directly with gnome keyring in the unit tests. Created 6 years, 10 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 | chrome/chrome_tests_unit.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 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 # doesn't agree with our BackingStore. 583 # doesn't agree with our BackingStore.
584 # TODO(beng): remove once skia text rendering is on by default. 584 # TODO(beng): remove once skia text rendering is on by default.
585 ['use_aura==1 and OS=="win"', { 585 ['use_aura==1 and OS=="win"', {
586 'enable_skia_text%': 1, 586 'enable_skia_text%': 1,
587 }], 587 }],
588 588
589 # A flag to enable or disable our compile-time dependency 589 # A flag to enable or disable our compile-time dependency
590 # on gnome-keyring. If that dependency is disabled, no gnome-keyring 590 # on gnome-keyring. If that dependency is disabled, no gnome-keyring
591 # support will be available. This option is useful 591 # support will be available. This option is useful
592 # for Linux distributions and for Aura. 592 # for Linux distributions and for Aura.
593 ['OS!="linux" or chromeos==1 or use_aura==1', { 593 ['OS!="linux" or chromeos==1', {
594 'use_gnome_keyring%': 0, 594 'use_gnome_keyring%': 0,
595 }, { 595 }, {
596 'use_gnome_keyring%': 1, 596 'use_gnome_keyring%': 1,
597 }], 597 }],
598 598
599 ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', { 599 ['toolkit_uses_gtk==1 or OS=="mac" or OS=="ios"', {
600 # GTK+, Mac and iOS want Title Case strings 600 # GTK+, Mac and iOS want Title Case strings
601 'use_titlecase_in_grd_files%': 1, 601 'use_titlecase_in_grd_files%': 1,
602 }], 602 }],
603 603
(...skipping 4380 matching lines...) Expand 10 before | Expand all | Expand 10 after
4984 # settings in target dicts. SYMROOT is a special case, because many other 4984 # settings in target dicts. SYMROOT is a special case, because many other
4985 # Xcode variables depend on it, including variables such as 4985 # Xcode variables depend on it, including variables such as
4986 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4986 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4987 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4987 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4988 # files to appear (when present) in the UI as actual files and not red 4988 # files to appear (when present) in the UI as actual files and not red
4989 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4989 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4990 # and therefore SYMROOT, needs to be set at the project level. 4990 # and therefore SYMROOT, needs to be set at the project level.
4991 'SYMROOT': '<(DEPTH)/xcodebuild', 4991 'SYMROOT': '<(DEPTH)/xcodebuild',
4992 }, 4992 },
4993 } 4993 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698