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

Side by Side Diff: build/common.gypi

Issue 1200413003: Disable "Ok Google" hotwording in open source builds by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hotword-compiletimedisable
Patch Set: Trigger on branding=Chrome, not buildtype=Official. Created 5 years, 6 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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 # for safe browsing feature. Safe browsing can be compiled in 4 different 409 # for safe browsing feature. Safe browsing can be compiled in 4 different
410 # levels: 0 disables it, 1 enables it fully, and 2 enables only UI and 410 # levels: 0 disables it, 1 enables it fully, and 2 enables only UI and
411 # reporting features for use with Data Saver on Mobile, and 3 enables 411 # reporting features for use with Data Saver on Mobile, and 3 enables
412 # extended mobile protection via an external API. When 3 is fully 412 # extended mobile protection via an external API. When 3 is fully
413 # deployed, it will replace 2. 413 # deployed, it will replace 2.
414 'safe_browsing%': 1, 414 'safe_browsing%': 1,
415 415
416 # Web speech is enabled by default. Set to 0 to disable. 416 # Web speech is enabled by default. Set to 0 to disable.
417 'enable_web_speech%': 1, 417 'enable_web_speech%': 1,
418 418
419 # 'Ok Google' hotwording is enabled by default. Set to 0 to disable. 419 # 'Ok Google' hotwording is disabled by default in open source builds. Set
420 'enable_hotwording%': 1, 420 # to 1 to enable. (This will download a closed-source NaCl module at
421 # startup.) Chrome-branded builds have this enabled by default.
422 'enable_hotwording%': 0,
421 423
422 # Notifications are compiled in by default. Set to 0 to disable. 424 # Notifications are compiled in by default. Set to 0 to disable.
423 'notifications%' : 1, 425 'notifications%' : 1,
424 426
425 # Use dsymutil to generate real .dSYM files on Mac. The default is 0 for 427 # Use dsymutil to generate real .dSYM files on Mac. The default is 0 for
426 # regular builds and 1 for ASan builds. 428 # regular builds and 1 for ASan builds.
427 'mac_want_real_dsym%': 'default', 429 'mac_want_real_dsym%': 'default',
428 430
429 # If this is set, the clang plugins used on the buildbot will be used. 431 # If this is set, the clang plugins used on the buildbot will be used.
430 # Run tools/clang/scripts/update.sh to make sure they are compiled. 432 # Run tools/clang/scripts/update.sh to make sure they are compiled.
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 831
830 # Enable autofill dialog when not on iOS. 832 # Enable autofill dialog when not on iOS.
831 ['OS!="ios"', { 833 ['OS!="ios"', {
832 'enable_autofill_dialog%': 1, 834 'enable_autofill_dialog%': 1,
833 }], 835 }],
834 836
835 ['buildtype=="Official"', { 837 ['buildtype=="Official"', {
836 'enable_prod_wallet_service%': 1, 838 'enable_prod_wallet_service%': 1,
837 }], 839 }],
838 840
841 ['branding=="Chrome"', {
Nico 2015/06/24 01:46:30 Isn't buildtype=Official a better check?
Matt Giuca 2015/06/24 01:59:47 See Anand's previous comment. (I initially had bui
842 'enable_hotwording%': 1,
843 }],
844
839 ['OS=="android"', { 845 ['OS=="android"', {
840 'enable_webrtc%': 1, 846 'enable_webrtc%': 1,
841 }], 847 }],
842 848
843 ['OS=="ios"', { 849 ['OS=="ios"', {
844 'disable_ftp_support%': 1, 850 'disable_ftp_support%': 1,
845 'enable_extensions%': 0, 851 'enable_extensions%': 0,
846 'enable_google_now%': 0, 852 'enable_google_now%': 0,
847 'cld_version%': 2, 853 'cld_version%': 2,
848 'cld2_table_size%': 0, 854 'cld2_table_size%': 0,
(...skipping 5354 matching lines...) Expand 10 before | Expand all | Expand 10 after
6203 # settings in target dicts. SYMROOT is a special case, because many other 6209 # settings in target dicts. SYMROOT is a special case, because many other
6204 # Xcode variables depend on it, including variables such as 6210 # Xcode variables depend on it, including variables such as
6205 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6211 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6206 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6212 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6207 # files to appear (when present) in the UI as actual files and not red 6213 # files to appear (when present) in the UI as actual files and not red
6208 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6214 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6209 # and therefore SYMROOT, needs to be set at the project level. 6215 # and therefore SYMROOT, needs to be set at the project level.
6210 'SYMROOT': '<(DEPTH)/xcodebuild', 6216 'SYMROOT': '<(DEPTH)/xcodebuild',
6211 }, 6217 },
6212 } 6218 }
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