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

Side by Side Diff: chrome/browser/BUILD.gn

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 | « build/common.gypi ('k') | chrome/browser/search/hotword_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/crypto.gni") 6 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 9
10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
11 # produces a conflict for the "grit" template so we have to only include one. 11 # produces a conflict for the "grit" template so we have to only include one.
12 if (is_android) { 12 if (is_android) {
13 import("//build/config/android/rules.gni") 13 import("//build/config/android/rules.gni")
14 } else { 14 } else {
15 import("//tools/grit/grit_rule.gni") 15 import("//tools/grit/grit_rule.gni")
16 } 16 }
17 if (is_desktop_linux) { 17 if (is_desktop_linux) {
18 import("//build/config/linux/pkg_config.gni") 18 import("//build/config/linux/pkg_config.gni")
19 } 19 }
20 20
21 declare_args() {
22 # 'Ok Google' hotwording is enabled.
23 enable_hotwording = true
24 }
25
21 about_credits_file = "$target_gen_dir/about_credits.html" 26 about_credits_file = "$target_gen_dir/about_credits.html"
22 additional_modules_list_file = 27 additional_modules_list_file =
23 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt" 28 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
24 29
25 gypi_values = exec_script("//build/gypi_to_gn.py", 30 gypi_values = exec_script("//build/gypi_to_gn.py",
26 [ rebase_path("../chrome_browser.gypi") ], 31 [ rebase_path("../chrome_browser.gypi") ],
27 "scope", 32 "scope",
28 [ "../chrome_browser.gypi" ]) 33 [ "../chrome_browser.gypi" ])
29 34
30 if (is_desktop_linux) { 35 if (is_desktop_linux) {
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 "//chrome") 453 "//chrome")
449 deps += [ "//chrome/common/safe_browsing:proto" ] 454 deps += [ "//chrome/common/safe_browsing:proto" ]
450 } else if (safe_browsing_mode == 3) { 455 } else if (safe_browsing_mode == 3) {
451 sources += rebase_path( 456 sources += rebase_path(
452 gypi_values.chrome_browser_safe_browsing_mobile_extended_sources, 457 gypi_values.chrome_browser_safe_browsing_mobile_extended_sources,
453 ".", 458 ".",
454 "//chrome") 459 "//chrome")
455 } 460 }
456 } 461 }
457 462
463 if (enable_hotwording) {
464 defines += [ "ENABLE_HOTWORDING" ]
465 }
466
458 if (is_linux) { 467 if (is_linux) {
459 deps += [ 468 deps += [
460 "//device/media_transfer_protocol", 469 "//device/media_transfer_protocol",
461 "//device/udev_linux", 470 "//device/udev_linux",
462 ] 471 ]
463 } 472 }
464 if (is_linux && !is_chromeos) { 473 if (is_linux && !is_chromeos) {
465 deps += [ "//third_party/speech-dispatcher" ] 474 deps += [ "//third_party/speech-dispatcher" ]
466 } 475 }
467 476
(...skipping 672 matching lines...) Expand 10 before | Expand all | Expand 10 after
1140 ] 1149 ]
1141 } 1150 }
1142 1151
1143 if (enable_wifi_bootstrapping) { 1152 if (enable_wifi_bootstrapping) {
1144 sources += [ 1153 sources += [
1145 "local_discovery/wifi/mock_wifi_manager.cc", 1154 "local_discovery/wifi/mock_wifi_manager.cc",
1146 "local_discovery/wifi/mock_wifi_manager.h", 1155 "local_discovery/wifi/mock_wifi_manager.h",
1147 ] 1156 ]
1148 } 1157 }
1149 } 1158 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/search/hotword_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698