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

Side by Side Diff: build/common.gypi

Issue 6648002: Make DBUS an optional dependency so Chromium can be built without it.... Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 9 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 | « AUTHORS ('k') | build/linux/system.gyp » ('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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp', 474 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
475 }], # use_libjpeg_turbo==1 475 }], # use_libjpeg_turbo==1
476 476
477 # Use GConf, the GNOME configuration system. 477 # Use GConf, the GNOME configuration system.
478 ['chromeos==1', { 478 ['chromeos==1', {
479 'use_gconf%': 0, 479 'use_gconf%': 0,
480 }, { 480 }, {
481 'use_gconf%': 1, 481 'use_gconf%': 1,
482 }], 482 }],
483 483
484 # Use DBUS on Linux.
485 ['OS=="linux"', {
486 'use_dbus%': 1,
487 }, {
488 'use_dbus%': 0,
489 }],
490
484 # Setup -D flags passed into grit. 491 # Setup -D flags passed into grit.
485 ['chromeos==1', { 492 ['chromeos==1', {
486 'grit_defines': ['-D', 'chromeos'], 493 'grit_defines': ['-D', 'chromeos'],
487 }], 494 }],
488 ['toolkit_views==1', { 495 ['toolkit_views==1', {
489 'grit_defines': ['-D', 'toolkit_views'], 496 'grit_defines': ['-D', 'toolkit_views'],
490 }], 497 }],
491 ['touchui==1', { 498 ['touchui==1', {
492 'grit_defines': ['-D', 'touchui'], 499 'grit_defines': ['-D', 'touchui'],
493 }], 500 }],
(...skipping 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 # and therefore SYMROOT, needs to be set at the project level. 1625 # and therefore SYMROOT, needs to be set at the project level.
1619 'SYMROOT': '<(DEPTH)/xcodebuild', 1626 'SYMROOT': '<(DEPTH)/xcodebuild',
1620 }, 1627 },
1621 } 1628 }
1622 1629
1623 # Local Variables: 1630 # Local Variables:
1624 # tab-width:2 1631 # tab-width:2
1625 # indent-tabs-mode:nil 1632 # indent-tabs-mode:nil
1626 # End: 1633 # End:
1627 # vim: set expandtab tabstop=2 shiftwidth=2: 1634 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « AUTHORS ('k') | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698