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

Side by Side Diff: build/common.gypi

Issue 11361051: Remove dependency on language detection library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 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/browser/chrome_browser_main.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 # 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 279
280 # Enable Web Intents support in WebKit. 280 # Enable Web Intents support in WebKit.
281 'enable_web_intents%': 1, 281 'enable_web_intents%': 1,
282 282
283 # Enable Chrome browser extensions 283 # Enable Chrome browser extensions
284 'enable_extensions%': 1, 284 'enable_extensions%': 1,
285 285
286 # Enable browser automation. 286 # Enable browser automation.
287 'enable_automation%': 1, 287 'enable_automation%': 1,
288 288
289 # Enable language detection.
290 'enable_language_detection%': 1,
291
289 # Enable printing support and UI. 292 # Enable printing support and UI.
290 'enable_printing%': 1, 293 'enable_printing%': 1,
291 294
292 # Enable Web Intents web content registration via HTML element 295 # Enable Web Intents web content registration via HTML element
293 # and WebUI managing such registrations. 296 # and WebUI managing such registrations.
294 'enable_web_intents_tag%': 0, 297 'enable_web_intents_tag%': 0,
295 298
296 # Webrtc compilation is enabled by default. Set to 0 to disable. 299 # Webrtc compilation is enabled by default. Set to 0 to disable.
297 'enable_webrtc%': 1, 300 'enable_webrtc%': 1,
298 301
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 }, { 455 }, {
453 'file_manager_extension%': 0, 456 'file_manager_extension%': 0,
454 }], 457 }],
455 458
456 ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', { 459 ['OS=="win" or OS=="mac" or (OS=="linux" and use_aura==0)', {
457 'enable_one_click_signin%': 1, 460 'enable_one_click_signin%': 1,
458 }], 461 }],
459 462
460 ['OS=="android"', { 463 ['OS=="android"', {
461 'enable_extensions%': 0, 464 'enable_extensions%': 0,
465 'enable_language_detection%': 0,
462 'enable_printing%': 0, 466 'enable_printing%': 0,
463 'enable_themes%': 0, 467 'enable_themes%': 0,
464 'enable_webrtc%': 0, 468 'enable_webrtc%': 0,
465 'proprietary_codecs%': 1, 469 'proprietary_codecs%': 1,
466 'remoting%': 0, 470 'remoting%': 0,
467 }], 471 }],
468 472
469 ['OS=="ios"', { 473 ['OS=="ios"', {
470 'configuration_policy%': 0, 474 'configuration_policy%': 0,
471 'disable_ftp_support%': 1, 475 'disable_ftp_support%': 1,
472 'enable_automation%': 0, 476 'enable_automation%': 0,
473 'enable_extensions%': 0, 477 'enable_extensions%': 0,
478 'enable_language_detection%': 0,
474 'enable_printing%': 0, 479 'enable_printing%': 0,
475 'enable_session_service%': 0, 480 'enable_session_service%': 0,
476 'enable_themes%': 0, 481 'enable_themes%': 0,
477 'enable_webrtc%': 0, 482 'enable_webrtc%': 0,
478 'notifications%': 0, 483 'notifications%': 0,
479 'remoting%': 0, 484 'remoting%': 0,
480 'safe_browsing%': 0, 485 'safe_browsing%': 0,
481 }], 486 }],
482 487
483 # Use GPU accelerated cross process image transport by default 488 # Use GPU accelerated cross process image transport by default
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 'enable_themes%': '<(enable_themes)', 652 'enable_themes%': '<(enable_themes)',
648 'use_oem_wallpaper%': '<(use_oem_wallpaper)', 653 'use_oem_wallpaper%': '<(use_oem_wallpaper)',
649 'enable_background%': '<(enable_background)', 654 'enable_background%': '<(enable_background)',
650 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 655 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
651 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 656 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
652 'use_canvas_skia%': '<(use_canvas_skia)', 657 'use_canvas_skia%': '<(use_canvas_skia)',
653 'test_isolation_mode%': '<(test_isolation_mode)', 658 'test_isolation_mode%': '<(test_isolation_mode)',
654 'test_isolation_outdir%': '<(test_isolation_outdir)', 659 'test_isolation_outdir%': '<(test_isolation_outdir)',
655 'enable_automation%': '<(enable_automation)', 660 'enable_automation%': '<(enable_automation)',
656 'enable_printing%': '<(enable_printing)', 661 'enable_printing%': '<(enable_printing)',
662 'enable_language_detection%': '<(enable_language_detection)',
657 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 663 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
658 'disable_ftp_support%': '<(disable_ftp_support)', 664 'disable_ftp_support%': '<(disable_ftp_support)',
659 'enable_task_manager%': '<(enable_task_manager)', 665 'enable_task_manager%': '<(enable_task_manager)',
660 'sas_dll_path%': '<(sas_dll_path)', 666 'sas_dll_path%': '<(sas_dll_path)',
661 'wix_path%': '<(wix_path)', 667 'wix_path%': '<(wix_path)',
662 'android_upstream_bringup%': '<(android_upstream_bringup)', 668 'android_upstream_bringup%': '<(android_upstream_bringup)',
663 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 669 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
664 'use_system_libjpeg%': '<(use_system_libjpeg)', 670 'use_system_libjpeg%': '<(use_system_libjpeg)',
665 'android_build_type%': '<(android_build_type)', 671 'android_build_type%': '<(android_build_type)',
666 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 672 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
(...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1775 }], 1781 }],
1776 ['enable_themes==1', { 1782 ['enable_themes==1', {
1777 'defines': ['ENABLE_THEMES=1'], 1783 'defines': ['ENABLE_THEMES=1'],
1778 }], 1784 }],
1779 ['enable_background==1', { 1785 ['enable_background==1', {
1780 'defines': ['ENABLE_BACKGROUND=1'], 1786 'defines': ['ENABLE_BACKGROUND=1'],
1781 }], 1787 }],
1782 ['enable_automation==1', { 1788 ['enable_automation==1', {
1783 'defines': ['ENABLE_AUTOMATION=1'], 1789 'defines': ['ENABLE_AUTOMATION=1'],
1784 }], 1790 }],
1791 ['enable_language_detection==1', {
1792 'defines': ['ENABLE_LANGUAGE_DETECTION=1'],
1793 }],
1785 ['enable_printing==1', { 1794 ['enable_printing==1', {
1786 'defines': ['ENABLE_PRINTING=1'], 1795 'defines': ['ENABLE_PRINTING=1'],
1787 }], 1796 }],
1788 ['enable_captive_portal_detection==1', { 1797 ['enable_captive_portal_detection==1', {
1789 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], 1798 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'],
1790 }], 1799 }],
1791 ['disable_ftp_support==1', { 1800 ['disable_ftp_support==1', {
1792 'defines': ['DISABLE_FTP_SUPPORT=1'], 1801 'defines': ['DISABLE_FTP_SUPPORT=1'],
1793 }], 1802 }],
1794 ], # conditions for 'target_defaults' 1803 ], # conditions for 'target_defaults'
(...skipping 1881 matching lines...) Expand 10 before | Expand all | Expand 10 after
3676 # settings in target dicts. SYMROOT is a special case, because many other 3685 # settings in target dicts. SYMROOT is a special case, because many other
3677 # Xcode variables depend on it, including variables such as 3686 # Xcode variables depend on it, including variables such as
3678 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3687 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3679 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3688 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3680 # files to appear (when present) in the UI as actual files and not red 3689 # files to appear (when present) in the UI as actual files and not red
3681 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3690 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3682 # and therefore SYMROOT, needs to be set at the project level. 3691 # and therefore SYMROOT, needs to be set at the project level.
3683 'SYMROOT': '<(DEPTH)/xcodebuild', 3692 'SYMROOT': '<(DEPTH)/xcodebuild',
3684 }, 3693 },
3685 } 3694 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698