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

Side by Side Diff: build/common.gypi

Issue 6904053: Remove ibus checking script from views.gyp and add use_ibus=1 option (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated Created 9 years, 8 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 | 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 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 }], 534 }],
535 ['use_third_party_translations==1', { 535 ['use_third_party_translations==1', {
536 'grit_defines': ['-D', 'use_third_party_translations'], 536 'grit_defines': ['-D', 'use_third_party_translations'],
537 'locales': ['ast', 'eu', 'gl', 'ka', 'ku', 'ug'], 537 'locales': ['ast', 'eu', 'gl', 'ka', 'ku', 'ug'],
538 }], 538 }],
539 539
540 ['clang_use_chrome_plugins==1', { 540 ['clang_use_chrome_plugins==1', {
541 'clang_chrome_plugins_flags': 541 'clang_chrome_plugins_flags':
542 '<!(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)', 542 '<!(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)',
543 }], 543 }],
544
545 # Set 1 to enable ibus support. Currently it is only supported in touchui.
546 ['touchui==1 and chromeos==1', {
547 'use_ibus%': 1,
548 }, {
549 'use_ibus%': 0,
550 }]
544 ], 551 ],
545 }, 552 },
546 'target_defaults': { 553 'target_defaults': {
547 'variables': { 554 'variables': {
548 # The condition that operates on chromium_code is in a target_conditions 555 # The condition that operates on chromium_code is in a target_conditions
549 # section, and will not have access to the default fallback value of 556 # section, and will not have access to the default fallback value of
550 # chromium_code at the top of this file, or to the chromium_code 557 # chromium_code at the top of this file, or to the chromium_code
551 # variable placed at the root variables scope of .gyp files, because 558 # variable placed at the root variables scope of .gyp files, because
552 # those variables are not set at target scope. As a workaround, 559 # those variables are not set at target scope. As a workaround,
553 # if chromium_code is not set at target scope, define it in target scope 560 # if chromium_code is not set at target scope, define it in target scope
(...skipping 1136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1690 # and therefore SYMROOT, needs to be set at the project level. 1697 # and therefore SYMROOT, needs to be set at the project level.
1691 'SYMROOT': '<(DEPTH)/xcodebuild', 1698 'SYMROOT': '<(DEPTH)/xcodebuild',
1692 }, 1699 },
1693 } 1700 }
1694 1701
1695 # Local Variables: 1702 # Local Variables:
1696 # tab-width:2 1703 # tab-width:2
1697 # indent-tabs-mode:nil 1704 # indent-tabs-mode:nil
1698 # End: 1705 # End:
1699 # vim: set expandtab tabstop=2 shiftwidth=2: 1706 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698