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

Side by Side Diff: build/common.gypi

Issue 356963003: Introduce enable_web_speech to replace with input_speech (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build error Created 6 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 | build/config/features.gni » ('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 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 'configuration_policy%': 1, 322 'configuration_policy%': 1,
323 323
324 # Variable safe_browsing is used to control the build time configuration 324 # Variable safe_browsing is used to control the build time configuration
325 # for safe browsing feature. Safe browsing can be compiled in 3 different 325 # for safe browsing feature. Safe browsing can be compiled in 3 different
326 # levels: 0 disables it, 1 enables it fully, and 2 enables only UI and 326 # levels: 0 disables it, 1 enables it fully, and 2 enables only UI and
327 # reporting features without enabling phishing and malware detection. This 327 # reporting features without enabling phishing and malware detection. This
328 # is useful to integrate a third party phishing/malware detection to 328 # is useful to integrate a third party phishing/malware detection to
329 # existing safe browsing logic. 329 # existing safe browsing logic.
330 'safe_browsing%': 1, 330 'safe_browsing%': 1,
331 331
332 # Speech input is compiled in by default. Set to 0 to disable. 332 # Web speech is enabled by default. Set to 0 to disable.
333 # TODO(tommyw): Speech Input doesn't exist anymore. Clarify the scope 333 'enable_web_speech%': 1,
334 # of this flag (and probably rename it).
335 'input_speech%': 1,
336 334
337 # Notifications are compiled in by default. Set to 0 to disable. 335 # Notifications are compiled in by default. Set to 0 to disable.
338 'notifications%' : 1, 336 'notifications%' : 1,
339 337
340 # Use dsymutil to generate real .dSYM files on Mac. The default is 0 for 338 # Use dsymutil to generate real .dSYM files on Mac. The default is 0 for
341 # regular builds and 1 for ASan builds. 339 # regular builds and 1 for ASan builds.
342 'mac_want_real_dsym%': 'default', 340 'mac_want_real_dsym%': 'default',
343 341
344 # If this is set, the clang plugins used on the buildbot will be used. 342 # If this is set, the clang plugins used on the buildbot will be used.
345 # Run tools/clang/scripts/update.sh to make sure they are compiled. 343 # Run tools/clang/scripts/update.sh to make sure they are compiled.
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_genera tion)', 1048 'enable_resource_whitelist_generation%': '<(enable_resource_whitelist_genera tion)',
1051 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', 1049 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
1052 'use_third_party_translations%': '<(use_third_party_translations)', 1050 'use_third_party_translations%': '<(use_third_party_translations)',
1053 'remoting%': '<(remoting)', 1051 'remoting%': '<(remoting)',
1054 'enable_one_click_signin%': '<(enable_one_click_signin)', 1052 'enable_one_click_signin%': '<(enable_one_click_signin)',
1055 'enable_pre_sync_backup%': '<(enable_pre_sync_backup)', 1053 'enable_pre_sync_backup%': '<(enable_pre_sync_backup)',
1056 'enable_webrtc%': '<(enable_webrtc)', 1054 'enable_webrtc%': '<(enable_webrtc)',
1057 'chromium_win_pch%': '<(chromium_win_pch)', 1055 'chromium_win_pch%': '<(chromium_win_pch)',
1058 'configuration_policy%': '<(configuration_policy)', 1056 'configuration_policy%': '<(configuration_policy)',
1059 'safe_browsing%': '<(safe_browsing)', 1057 'safe_browsing%': '<(safe_browsing)',
1060 'input_speech%': '<(input_speech)', 1058 'enable_web_speech%': '<(enable_web_speech)',
1061 'notifications%': '<(notifications)', 1059 'notifications%': '<(notifications)',
1062 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 1060 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
1063 'mac_want_real_dsym%': '<(mac_want_real_dsym)', 1061 'mac_want_real_dsym%': '<(mac_want_real_dsym)',
1064 'asan%': '<(asan)', 1062 'asan%': '<(asan)',
1065 'asan_coverage%': '<(asan_coverage)', 1063 'asan_coverage%': '<(asan_coverage)',
1066 'use_sanitizer_options%': '<(use_sanitizer_options)', 1064 'use_sanitizer_options%': '<(use_sanitizer_options)',
1067 'syzyasan%': '<(syzyasan)', 1065 'syzyasan%': '<(syzyasan)',
1068 'syzygy_optimize%': '<(syzygy_optimize)', 1066 'syzygy_optimize%': '<(syzygy_optimize)',
1069 'lsan%': '<(lsan)', 1067 'lsan%': '<(lsan)',
1070 'msan%': '<(msan)', 1068 'msan%': '<(msan)',
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
1560 'binutils_dir%': 'third_party/binutils/Linux_x64/Release/bin', 1558 'binutils_dir%': 'third_party/binutils/Linux_x64/Release/bin',
1561 }], 1559 }],
1562 ], 1560 ],
1563 }], 1561 }],
1564 ], 1562 ],
1565 }], # os_posix==1 and OS!="mac" and OS!="ios" 1563 }], # os_posix==1 and OS!="mac" and OS!="ios"
1566 ['OS=="ios"', { 1564 ['OS=="ios"', {
1567 'disable_nacl%': 1, 1565 'disable_nacl%': 1,
1568 'enable_background%': 0, 1566 'enable_background%': 0,
1569 'icu_use_data_file_flag%': 1, 1567 'icu_use_data_file_flag%': 1,
1570 'input_speech%': 0, 1568 'enable_web_speech%': 0,
1571 'use_system_libxml%': 1, 1569 'use_system_libxml%': 1,
1572 'use_system_sqlite%': 1, 1570 'use_system_sqlite%': 1,
1573 'locales==': [ 1571 'locales==': [
1574 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX', 1572 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX',
1575 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb', 1573 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb',
1576 'nl', 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk', 1574 'nl', 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk',
1577 'vi', 'zh-CN', 'zh-TW', 1575 'vi', 'zh-CN', 'zh-TW',
1578 ], 1576 ],
1579 1577
1580 # The Mac SDK is set for iOS builds and passed through to Mac 1578 # The Mac SDK is set for iOS builds and passed through to Mac
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
1713 # the outputs should always change as well. This is meant purely for 1711 # the outputs should always change as well. This is meant purely for
1714 # developer builds, to avoid spurious re-linking of native files. 1712 # developer builds, to avoid spurious re-linking of native files.
1715 'optimize_jni_generation%': 0, 1713 'optimize_jni_generation%': 0,
1716 1714
1717 # Always uses openssl. 1715 # Always uses openssl.
1718 'use_openssl%': 1, 1716 'use_openssl%': 1,
1719 'use_openssl_certs%': 1, 1717 'use_openssl_certs%': 1,
1720 1718
1721 'proprietary_codecs%': '<(proprietary_codecs)', 1719 'proprietary_codecs%': '<(proprietary_codecs)',
1722 'safe_browsing%': 2, 1720 'safe_browsing%': 2,
1723 'input_speech%': 0, 1721 'enable_web_speech%': 0,
1724 'java_bridge%': 1, 1722 'java_bridge%': 1,
1725 'build_ffmpegsumo%': 0, 1723 'build_ffmpegsumo%': 0,
1726 'use_allocator%': 'none', 1724 'use_allocator%': 'none',
1727 1725
1728 # Disable Native Client. 1726 # Disable Native Client.
1729 'disable_nacl%': 1, 1727 'disable_nacl%': 1,
1730 1728
1731 # Android does not support background apps. 1729 # Android does not support background apps.
1732 'enable_background%': 0, 1730 'enable_background%': 0,
1733 1731
(...skipping 3802 matching lines...) Expand 10 before | Expand all | Expand 10 after
5536 # settings in target dicts. SYMROOT is a special case, because many other 5534 # settings in target dicts. SYMROOT is a special case, because many other
5537 # Xcode variables depend on it, including variables such as 5535 # Xcode variables depend on it, including variables such as
5538 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5536 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5539 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5537 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5540 # files to appear (when present) in the UI as actual files and not red 5538 # files to appear (when present) in the UI as actual files and not red
5541 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5539 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5542 # and therefore SYMROOT, needs to be set at the project level. 5540 # and therefore SYMROOT, needs to be set at the project level.
5543 'SYMROOT': '<(DEPTH)/xcodebuild', 5541 'SYMROOT': '<(DEPTH)/xcodebuild',
5544 }, 5542 },
5545 } 5543 }
OLDNEW
« no previous file with comments | « no previous file | build/config/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698