chrome/chrome_browser.gypi - Issue 1218693004: Add build flag to disable hotwording.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_browser.gypi

Issue 1218693004: Add build flag to disable hotwording. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403

Patch Set: Resolve merge conflict. 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:

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index 6d323eb4f4c941e5a574f611cd7612f9809a49f2..1aaedba280876a417e177d2c952a2b05069be686 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -3529,6 +3529,9 @@

['enable_session_service==1', {

'sources': [ '<@(chrome_browser_session_service_sources)' ],

}],

+ ['enable_hotwording==1', {

+ 'defines': [ 'ENABLE_HOTWORDING' ],

+ }],

['OS!="android" and OS!="ios" and chromeos==0', {

'sources': [ '<@(chrome_browser_desktop_sources)' ],

}],

« no previous file with comments | « chrome/browser/search/hotword_service_unittest.cc ('k') | no next file » | no next file with comments »