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

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

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 | « 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 import("//third_party/protobuf/proto_library.gni") 9 import("//third_party/protobuf/proto_library.gni")
10 10
11 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 11 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
12 # produces a conflict for the "grit" template so we have to only include one. 12 # produces a conflict for the "grit" template so we have to only include one.
13 if (is_android) { 13 if (is_android) {
14 import("//build/config/android/rules.gni") 14 import("//build/config/android/rules.gni")
15 } else { 15 } else {
16 import("//tools/grit/grit_rule.gni") 16 import("//tools/grit/grit_rule.gni")
17 } 17 }
18 if (is_desktop_linux) { 18 if (is_desktop_linux) {
19 import("//build/config/linux/pkg_config.gni") 19 import("//build/config/linux/pkg_config.gni")
20 } 20 }
21 21
22 declare_args() {
23 # 'Ok Google' hotwording is enabled.
24 enable_hotwording = true
25 }
26
22 about_credits_file = "$target_gen_dir/about_credits.html" 27 about_credits_file = "$target_gen_dir/about_credits.html"
23 additional_modules_list_file = 28 additional_modules_list_file =
24 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt" 29 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
25 30
26 gypi_values = exec_script("//build/gypi_to_gn.py", 31 gypi_values = exec_script("//build/gypi_to_gn.py",
27 [ rebase_path("../chrome_browser.gypi") ], 32 [ rebase_path("../chrome_browser.gypi") ],
28 "scope", 33 "scope",
29 [ "../chrome_browser.gypi" ]) 34 [ "../chrome_browser.gypi" ])
30 35
31 if (is_desktop_linux) { 36 if (is_desktop_linux) {
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 "//chrome") 450 "//chrome")
446 deps += [ "//chrome/common/safe_browsing:proto" ] 451 deps += [ "//chrome/common/safe_browsing:proto" ]
447 } else if (safe_browsing_mode == 3) { 452 } else if (safe_browsing_mode == 3) {
448 sources += rebase_path( 453 sources += rebase_path(
449 gypi_values.chrome_browser_safe_browsing_mobile_extended_sources, 454 gypi_values.chrome_browser_safe_browsing_mobile_extended_sources,
450 ".", 455 ".",
451 "//chrome") 456 "//chrome")
452 } 457 }
453 } 458 }
454 459
460 if (enable_hotwording) {
461 defines += [ "ENABLE_HOTWORDING" ]
462 }
463
455 if (is_linux) { 464 if (is_linux) {
456 deps += [ 465 deps += [
457 "//device/media_transfer_protocol", 466 "//device/media_transfer_protocol",
458 "//device/udev_linux", 467 "//device/udev_linux",
459 ] 468 ]
460 } 469 }
461 if (is_linux && !is_chromeos) { 470 if (is_linux && !is_chromeos) {
462 deps += [ "//third_party/speech-dispatcher" ] 471 deps += [ "//third_party/speech-dispatcher" ]
463 } 472 }
464 473
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
1164 ] 1173 ]
1165 } 1174 }
1166 1175
1167 if (enable_wifi_bootstrapping) { 1176 if (enable_wifi_bootstrapping) {
1168 sources += [ 1177 sources += [
1169 "local_discovery/wifi/mock_wifi_manager.cc", 1178 "local_discovery/wifi/mock_wifi_manager.cc",
1170 "local_discovery/wifi/mock_wifi_manager.h", 1179 "local_discovery/wifi/mock_wifi_manager.h",
1171 ] 1180 ]
1172 } 1181 }
1173 } 1182 }
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