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

Side by Side Diff: build/common.gypi

Issue 18820002: Remove ENABLE_LANGUAGE_DETECTION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bug fix: mis-rebased Created 7 years, 5 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
« 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 330
331 # Enable Chrome browser extensions 331 # Enable Chrome browser extensions
332 'enable_extensions%': 1, 332 'enable_extensions%': 1,
333 333
334 # Enable browser automation. 334 # Enable browser automation.
335 'enable_automation%': 1, 335 'enable_automation%': 1,
336 336
337 # Enable Google Now. 337 # Enable Google Now.
338 'enable_google_now%': 1, 338 'enable_google_now%': 1,
339 339
340 # Enable language detection.
341 'enable_language_detection%': 1,
342
343 # Enable printing support and UI. 340 # Enable printing support and UI.
344 'enable_printing%': 1, 341 'enable_printing%': 1,
345 342
346 # Webrtc compilation is enabled by default. Set to 0 to disable. 343 # Webrtc compilation is enabled by default. Set to 0 to disable.
347 'enable_webrtc%': 1, 344 'enable_webrtc%': 1,
348 345
349 # Enables use of the session service, which is enabled by default. 346 # Enables use of the session service, which is enabled by default.
350 # Support for disabling depends on the platform. 347 # Support for disabling depends on the platform.
351 'enable_session_service%': 1, 348 'enable_session_service%': 1,
352 349
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 }], 503 }],
507 504
508 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', { 505 ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', {
509 'enable_one_click_signin%': 1, 506 'enable_one_click_signin%': 1,
510 }], 507 }],
511 508
512 ['OS=="android"', { 509 ['OS=="android"', {
513 'enable_automation%': 0, 510 'enable_automation%': 0,
514 'enable_extensions%': 0, 511 'enable_extensions%': 0,
515 'enable_google_now%': 0, 512 'enable_google_now%': 0,
516 'enable_language_detection%': 1,
517 'enable_printing%': 0, 513 'enable_printing%': 0,
518 'enable_themes%': 0, 514 'enable_themes%': 0,
519 'proprietary_codecs%': 1, 515 'proprietary_codecs%': 1,
520 'remoting%': 0, 516 'remoting%': 0,
521 'arm_neon%': 0, 517 'arm_neon%': 0,
522 'arm_neon_optional%': 1, 518 'arm_neon_optional%': 1,
523 'native_discardable_memory%': 1, 519 'native_discardable_memory%': 1,
524 'native_memory_pressure_signals%': 1, 520 'native_memory_pressure_signals%': 1,
525 }], 521 }],
526 522
(...skipping 12 matching lines...) Expand all
539 ['OS=="android" and android_webview_build==1', { 535 ['OS=="android" and android_webview_build==1', {
540 'enable_webrtc%': 0, 536 'enable_webrtc%': 0,
541 }], 537 }],
542 538
543 ['OS=="ios"', { 539 ['OS=="ios"', {
544 'configuration_policy%': 0, 540 'configuration_policy%': 0,
545 'disable_ftp_support%': 1, 541 'disable_ftp_support%': 1,
546 'enable_automation%': 0, 542 'enable_automation%': 0,
547 'enable_extensions%': 0, 543 'enable_extensions%': 0,
548 'enable_google_now%': 0, 544 'enable_google_now%': 0,
549 'enable_language_detection%': 1,
550 'enable_printing%': 0, 545 'enable_printing%': 0,
551 'enable_session_service%': 0, 546 'enable_session_service%': 0,
552 'enable_themes%': 0, 547 'enable_themes%': 0,
553 'enable_webrtc%': 0, 548 'enable_webrtc%': 0,
554 'notifications%': 0, 549 'notifications%': 0,
555 'remoting%': 0, 550 'remoting%': 0,
556 'safe_browsing%': 0, 551 'safe_browsing%': 0,
557 'enable_managed_users%': 0, 552 'enable_managed_users%': 0,
558 }], 553 }],
559 554
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 'linux_use_gold_binary%': '<(linux_use_gold_binary)', 811 'linux_use_gold_binary%': '<(linux_use_gold_binary)',
817 'linux_use_gold_flags%': '<(linux_use_gold_flags)', 812 'linux_use_gold_flags%': '<(linux_use_gold_flags)',
818 'linux_use_libgps%': '<(linux_use_libgps)', 813 'linux_use_libgps%': '<(linux_use_libgps)',
819 'use_canvas_skia%': '<(use_canvas_skia)', 814 'use_canvas_skia%': '<(use_canvas_skia)',
820 'test_isolation_mode%': '<(test_isolation_mode)', 815 'test_isolation_mode%': '<(test_isolation_mode)',
821 'test_isolation_outdir%': '<(test_isolation_outdir)', 816 'test_isolation_outdir%': '<(test_isolation_outdir)',
822 'test_isolation_fail_on_missing': '<(test_isolation_fail_on_missing)', 817 'test_isolation_fail_on_missing': '<(test_isolation_fail_on_missing)',
823 'enable_automation%': '<(enable_automation)', 818 'enable_automation%': '<(enable_automation)',
824 'enable_printing%': '<(enable_printing)', 819 'enable_printing%': '<(enable_printing)',
825 'enable_google_now%': '<(enable_google_now)', 820 'enable_google_now%': '<(enable_google_now)',
826 'enable_language_detection%': '<(enable_language_detection)',
827 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 821 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
828 'disable_ftp_support%': '<(disable_ftp_support)', 822 'disable_ftp_support%': '<(disable_ftp_support)',
829 'enable_task_manager%': '<(enable_task_manager)', 823 'enable_task_manager%': '<(enable_task_manager)',
830 'sas_dll_path%': '<(sas_dll_path)', 824 'sas_dll_path%': '<(sas_dll_path)',
831 'wix_path%': '<(wix_path)', 825 'wix_path%': '<(wix_path)',
832 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 826 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
833 'use_system_libjpeg%': '<(use_system_libjpeg)', 827 'use_system_libjpeg%': '<(use_system_libjpeg)',
834 'android_webview_build%': '<(android_webview_build)', 828 'android_webview_build%': '<(android_webview_build)',
835 'gyp_managed_install%': 0, 829 'gyp_managed_install%': 0,
836 'create_standalone_apk%': 1, 830 'create_standalone_apk%': 1,
(...skipping 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after
2223 }], 2217 }],
2224 ['enable_background==1', { 2218 ['enable_background==1', {
2225 'defines': ['ENABLE_BACKGROUND=1'], 2219 'defines': ['ENABLE_BACKGROUND=1'],
2226 }], 2220 }],
2227 ['enable_automation==1', { 2221 ['enable_automation==1', {
2228 'defines': ['ENABLE_AUTOMATION=1'], 2222 'defines': ['ENABLE_AUTOMATION=1'],
2229 }], 2223 }],
2230 ['enable_google_now==1', { 2224 ['enable_google_now==1', {
2231 'defines': ['ENABLE_GOOGLE_NOW=1'], 2225 'defines': ['ENABLE_GOOGLE_NOW=1'],
2232 }], 2226 }],
2233 ['enable_language_detection==1', {
2234 'defines': ['ENABLE_LANGUAGE_DETECTION=1'],
2235 }],
2236 ['enable_printing==1', { 2227 ['enable_printing==1', {
2237 'defines': ['ENABLE_PRINTING=1'], 2228 'defines': ['ENABLE_PRINTING=1'],
2238 }], 2229 }],
2239 ['enable_captive_portal_detection==1', { 2230 ['enable_captive_portal_detection==1', {
2240 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], 2231 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'],
2241 }], 2232 }],
2242 ['enable_app_list==1', { 2233 ['enable_app_list==1', {
2243 'defines': ['ENABLE_APP_LIST=1'], 2234 'defines': ['ENABLE_APP_LIST=1'],
2244 }], 2235 }],
2245 ['enable_settings_app==1', { 2236 ['enable_settings_app==1', {
(...skipping 2407 matching lines...) Expand 10 before | Expand all | Expand 10 after
4653 # settings in target dicts. SYMROOT is a special case, because many other 4644 # settings in target dicts. SYMROOT is a special case, because many other
4654 # Xcode variables depend on it, including variables such as 4645 # Xcode variables depend on it, including variables such as
4655 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4646 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4656 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4647 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4657 # files to appear (when present) in the UI as actual files and not red 4648 # files to appear (when present) in the UI as actual files and not red
4658 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4649 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4659 # and therefore SYMROOT, needs to be set at the project level. 4650 # and therefore SYMROOT, needs to be set at the project level.
4660 'SYMROOT': '<(DEPTH)/xcodebuild', 4651 'SYMROOT': '<(DEPTH)/xcodebuild',
4661 }, 4652 },
4662 } 4653 }
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