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

Unified Diff: build/common.gypi

Issue 1218763002: Revert "Disable "Ok Google" hotwording in open source builds by default." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
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') | no next file with comments »
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 2f3f20975175f1ead0a26abc0b308fa5f7aab2c4..ddb075c5467320f0b4e5a1228b68ee478e3a9151 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -381,10 +381,8 @@
# Web speech is enabled by default. Set to 0 to disable.
'enable_web_speech%': 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.) Chrome-branded builds have this enabled by default.
- 'enable_hotwording%': 0,
+ # 'Ok Google' hotwording is enabled by default. Set to 0 to disable.
+ 'enable_hotwording%': 1,
# Notifications are compiled in by default. Set to 0 to disable.
'notifications%' : 1,
@@ -815,10 +813,6 @@
]
}],
- ['branding=="Chrome"', {
- 'enable_hotwording%': 1,
- }],
-
['OS=="android"', {
'enable_webrtc%': 1,
}],
« 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