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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 1160243004: Add build flag to disable hotwording. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back to flag and enable by default. 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 | « chrome/browser/search/hotword_service_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 { 5 {
6 'variables': { 6 'variables': {
7 # All .cc, .h, .m, and .mm files under browser except for: 7 # All .cc, .h, .m, and .mm files under browser except for:
8 # * tests and mocks. 8 # * tests and mocks.
9 # * code below browser/chromeos 9 # * code below browser/chromeos
10 # * code below browser/extensions 10 # * code below browser/extensions
(...skipping 3555 matching lines...) Expand 10 before | Expand all | Expand 10 after
3566 # Partial-only printing support. 3566 # Partial-only printing support.
3567 ['enable_basic_printing==1 and enable_print_preview==0', { 3567 ['enable_basic_printing==1 and enable_print_preview==0', {
3568 'sources': [ '<@(chrome_browser_printing_basic_only_sources)' ], 3568 'sources': [ '<@(chrome_browser_printing_basic_only_sources)' ],
3569 }], 3569 }],
3570 ['enable_captive_portal_detection==1', { 3570 ['enable_captive_portal_detection==1', {
3571 'sources': [ '<@(chrome_browser_captive_portal_sources)' ] 3571 'sources': [ '<@(chrome_browser_captive_portal_sources)' ]
3572 }], 3572 }],
3573 ['enable_session_service==1', { 3573 ['enable_session_service==1', {
3574 'sources': [ '<@(chrome_browser_session_service_sources)' ], 3574 'sources': [ '<@(chrome_browser_session_service_sources)' ],
3575 }], 3575 }],
3576 ['enable_hotwording==1', {
3577 'defines': [ 'ENABLE_HOTWORDING' ],
3578 }],
3576 ['OS!="android" and OS!="ios" and chromeos==0', { 3579 ['OS!="android" and OS!="ios" and chromeos==0', {
3577 'sources': [ '<@(chrome_browser_desktop_sources)' ], 3580 'sources': [ '<@(chrome_browser_desktop_sources)' ],
3578 }], 3581 }],
3579 ['OS=="android" or OS=="ios"', { 3582 ['OS=="android" or OS=="ios"', {
3580 'sources': [ '<@(chrome_browser_mobile_sources)' ], 3583 'sources': [ '<@(chrome_browser_mobile_sources)' ],
3581 }, { # OS!="android" and OS!="ios" 3584 }, { # OS!="android" and OS!="ios"
3582 'sources': [ '<@(chrome_browser_non_mobile_sources)' ], 3585 'sources': [ '<@(chrome_browser_non_mobile_sources)' ],
3583 'dependencies': [ 3586 'dependencies': [
3584 '../components/components.gyp:feedback_component', 3587 '../components/components.gyp:feedback_component',
3585 '../device/core/core.gyp:device_core', 3588 '../device/core/core.gyp:device_core',
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
3995 'variables': { 3998 'variables': {
3996 'proto_in_dir': 'browser/sync_file_system/drive_backend', 3999 'proto_in_dir': 'browser/sync_file_system/drive_backend',
3997 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend', 4000 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
3998 }, 4001 },
3999 'includes': [ '../build/protoc.gypi' ] 4002 'includes': [ '../build/protoc.gypi' ]
4000 }, 4003 },
4001 ], 4004 ],
4002 },], 4005 },],
4003 ], 4006 ],
4004 } 4007 }
OLDNEW
« no previous file with comments | « chrome/browser/search/hotword_service_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698