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

Side by Side Diff: build/common.gypi

Issue 1211273003: Disable "Ok Google" hotwording in open source builds by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hotword-clarify-labels
Patch Set: Rebase properly. Created 5 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/BUILD.gn » ('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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 # for safe browsing feature. Safe browsing can be compiled in 4 different 374 # for safe browsing feature. Safe browsing can be compiled in 4 different
375 # levels: 0 disables it, 1 enables it fully, and 2 enables only UI and 375 # levels: 0 disables it, 1 enables it fully, and 2 enables only UI and
376 # reporting features for use with Data Saver on Mobile, and 3 enables 376 # reporting features for use with Data Saver on Mobile, and 3 enables
377 # extended mobile protection via an external API. When 3 is fully 377 # extended mobile protection via an external API. When 3 is fully
378 # deployed, it will replace 2. 378 # deployed, it will replace 2.
379 'safe_browsing%': 1, 379 'safe_browsing%': 1,
380 380
381 # Web speech is enabled by default. Set to 0 to disable. 381 # Web speech is enabled by default. Set to 0 to disable.
382 'enable_web_speech%': 1, 382 'enable_web_speech%': 1,
383 383
384 # 'Ok Google' hotwording is enabled by default. Set to 0 to disable. 384 # 'Ok Google' hotwording is disabled by default in open source builds. Set
385 'enable_hotwording%': 1, 385 # to 1 to enable. (This will download a closed-source NaCl module at
386 # startup.) Chrome-branded builds have this enabled by default.
387 'enable_hotwording%': 0,
386 388
387 # Notifications are compiled in by default. Set to 0 to disable. 389 # Notifications are compiled in by default. Set to 0 to disable.
388 'notifications%' : 1, 390 'notifications%' : 1,
389 391
390 # Use dsymutil to generate real .dSYM files on Mac. The default is 0 for 392 # Use dsymutil to generate real .dSYM files on Mac. The default is 0 for
391 # regular builds and 1 for ASan builds. 393 # regular builds and 1 for ASan builds.
392 'mac_want_real_dsym%': 'default', 394 'mac_want_real_dsym%': 'default',
393 395
394 # If this is set, the clang plugins used on the buildbot will be used. 396 # If this is set, the clang plugins used on the buildbot will be used.
395 # Run tools/clang/scripts/update.sh to make sure they are compiled. 397 # Run tools/clang/scripts/update.sh to make sure they are compiled.
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 ['OS!="ios"', { 808 ['OS!="ios"', {
807 'enable_autofill_dialog%': 1, 809 'enable_autofill_dialog%': 1,
808 810
809 'conditions': [ 811 'conditions': [
810 ['buildtype=="Official"', { 812 ['buildtype=="Official"', {
811 'enable_prod_wallet_service%': 1, 813 'enable_prod_wallet_service%': 1,
812 }], 814 }],
813 ] 815 ]
814 }], 816 }],
815 817
818 ['branding=="Chrome"', {
819 'enable_hotwording%': 1,
820 }],
821
816 ['OS=="android"', { 822 ['OS=="android"', {
817 'enable_webrtc%': 1, 823 'enable_webrtc%': 1,
818 }], 824 }],
819 825
820 ['OS=="ios"', { 826 ['OS=="ios"', {
821 'disable_ftp_support%': 1, 827 'disable_ftp_support%': 1,
822 'enable_extensions%': 0, 828 'enable_extensions%': 0,
823 'enable_google_now%': 0, 829 'enable_google_now%': 0,
824 'cld_version%': 2, 830 'cld_version%': 2,
825 'cld2_table_size%': 0, 831 'cld2_table_size%': 0,
(...skipping 5364 matching lines...) Expand 10 before | Expand all | Expand 10 after
6190 # settings in target dicts. SYMROOT is a special case, because many other 6196 # settings in target dicts. SYMROOT is a special case, because many other
6191 # Xcode variables depend on it, including variables such as 6197 # Xcode variables depend on it, including variables such as
6192 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6198 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6193 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6199 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6194 # files to appear (when present) in the UI as actual files and not red 6200 # files to appear (when present) in the UI as actual files and not red
6195 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6201 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6196 # and therefore SYMROOT, needs to be set at the project level. 6202 # and therefore SYMROOT, needs to be set at the project level.
6197 'SYMROOT': '<(DEPTH)/xcodebuild', 6203 'SYMROOT': '<(DEPTH)/xcodebuild',
6198 }, 6204 },
6199 } 6205 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698