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

Unified 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: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/BUILD.gn » ('j') | chrome/browser/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 9399c5d17afc3e1653eb003a77500c67e06ea284..6bd835250e87e5b887a4208e689831fa3527421a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -416,8 +416,10 @@
# Web speech is enabled by default. Set to 0 to disable.
'enable_web_speech%': 1,
- # 'Ok Google' hotwording is enabled by default. Set to 0 to disable.
- 'enable_hotwording%': 1,
+ # 'Ok Google' hotwording is disabled by default in open source builds. Set
+ # to 1 to enable. (This will download a closed-source NaCl module at
+ # startup.) Official builds have this enabled by default.
+ 'enable_hotwording%': 0,
# Notifications are compiled in by default. Set to 0 to disable.
'notifications%' : 1,
@@ -834,6 +836,7 @@
['buildtype=="Official"', {
'enable_prod_wallet_service%': 1,
+ 'enable_hotwording%': 1,
Anand Mistry (off Chromium) 2015/06/24 01:10:33 You want branding=="Chrome", not buildtype. buildt
Matt Giuca 2015/06/24 01:41:54 Done.
}],
['OS=="android"', {
« no previous file with comments | « no previous file | chrome/browser/BUILD.gn » ('j') | chrome/browser/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698