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

Side by Side 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, 5 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 3511 matching lines...) Expand 10 before | Expand all | Expand 10 after
3522 # Partial-only printing support. 3522 # Partial-only printing support.
3523 ['enable_basic_printing==1 and enable_print_preview==0', { 3523 ['enable_basic_printing==1 and enable_print_preview==0', {
3524 'sources': [ '<@(chrome_browser_printing_basic_only_sources)' ], 3524 'sources': [ '<@(chrome_browser_printing_basic_only_sources)' ],
3525 }], 3525 }],
3526 ['enable_captive_portal_detection==1', { 3526 ['enable_captive_portal_detection==1', {
3527 'sources': [ '<@(chrome_browser_captive_portal_sources)' ] 3527 'sources': [ '<@(chrome_browser_captive_portal_sources)' ]
3528 }], 3528 }],
3529 ['enable_session_service==1', { 3529 ['enable_session_service==1', {
3530 'sources': [ '<@(chrome_browser_session_service_sources)' ], 3530 'sources': [ '<@(chrome_browser_session_service_sources)' ],
3531 }], 3531 }],
3532 ['enable_hotwording==1', {
3533 'defines': [ 'ENABLE_HOTWORDING' ],
3534 }],
3532 ['OS!="android" and OS!="ios" and chromeos==0', { 3535 ['OS!="android" and OS!="ios" and chromeos==0', {
3533 'sources': [ '<@(chrome_browser_desktop_sources)' ], 3536 'sources': [ '<@(chrome_browser_desktop_sources)' ],
3534 }], 3537 }],
3535 ['OS=="android" or OS=="ios"', { 3538 ['OS=="android" or OS=="ios"', {
3536 'sources': [ '<@(chrome_browser_mobile_sources)' ], 3539 'sources': [ '<@(chrome_browser_mobile_sources)' ],
3537 }, { # OS!="android" and OS!="ios" 3540 }, { # OS!="android" and OS!="ios"
3538 'sources': [ '<@(chrome_browser_non_mobile_sources)' ], 3541 'sources': [ '<@(chrome_browser_non_mobile_sources)' ],
3539 'dependencies': [ 3542 'dependencies': [
3540 '../components/components.gyp:feedback_component', 3543 '../components/components.gyp:feedback_component',
3541 '../device/core/core.gyp:device_core', 3544 '../device/core/core.gyp:device_core',
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
3917 'variables': { 3920 'variables': {
3918 'proto_in_dir': 'browser/sync_file_system/drive_backend', 3921 'proto_in_dir': 'browser/sync_file_system/drive_backend',
3919 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend', 3922 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
3920 }, 3923 },
3921 'includes': [ '../build/protoc.gypi' ] 3924 'includes': [ '../build/protoc.gypi' ]
3922 }, 3925 },
3923 ], 3926 ],
3924 },], 3927 },],
3925 ], 3928 ],
3926 } 3929 }
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