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

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

Issue 1201163002: Remove hotword installation code at compile time if hotwording disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Same fix for GN builds. 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
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 disabled by default in open source builds. Set to
24 # true to enable. (This will download a closed-source NaCl module at startup.)
25 # Chrome-branded builds have this enabled by default.
26 enable_hotwording = is_chrome_branded
27 }
28
29 about_credits_file = "$target_gen_dir/about_credits.html" 22 about_credits_file = "$target_gen_dir/about_credits.html"
30 additional_modules_list_file = 23 additional_modules_list_file =
31 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt" 24 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
32 25
33 gypi_values = exec_script("//build/gypi_to_gn.py", 26 gypi_values = exec_script("//build/gypi_to_gn.py",
34 [ rebase_path("../chrome_browser.gypi") ], 27 [ rebase_path("../chrome_browser.gypi") ],
35 "scope", 28 "scope",
36 [ "../chrome_browser.gypi" ]) 29 [ "../chrome_browser.gypi" ])
37 30
38 if (is_desktop_linux) { 31 if (is_desktop_linux) {
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 "//chrome") 444 "//chrome")
452 deps += [ "//chrome/common/safe_browsing:proto" ] 445 deps += [ "//chrome/common/safe_browsing:proto" ]
453 } else if (safe_browsing_mode == 3) { 446 } else if (safe_browsing_mode == 3) {
454 sources += rebase_path( 447 sources += rebase_path(
455 gypi_values.chrome_browser_safe_browsing_mobile_extended_sources, 448 gypi_values.chrome_browser_safe_browsing_mobile_extended_sources,
456 ".", 449 ".",
457 "//chrome") 450 "//chrome")
458 } 451 }
459 } 452 }
460 453
461 if (enable_hotwording) {
462 defines += [ "ENABLE_HOTWORDING" ]
463 }
464
465 if (is_linux) { 454 if (is_linux) {
466 deps += [ 455 deps += [
467 "//device/media_transfer_protocol", 456 "//device/media_transfer_protocol",
468 "//device/udev_linux", 457 "//device/udev_linux",
469 ] 458 ]
470 } 459 }
471 if (is_linux && !is_chromeos) { 460 if (is_linux && !is_chromeos) {
472 deps += [ "//third_party/speech-dispatcher" ] 461 deps += [ "//third_party/speech-dispatcher" ]
473 } 462 }
474 463
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 ] 1165 ]
1177 } 1166 }
1178 1167
1179 if (enable_wifi_bootstrapping) { 1168 if (enable_wifi_bootstrapping) {
1180 sources += [ 1169 sources += [
1181 "local_discovery/wifi/mock_wifi_manager.cc", 1170 "local_discovery/wifi/mock_wifi_manager.cc",
1182 "local_discovery/wifi/mock_wifi_manager.h", 1171 "local_discovery/wifi/mock_wifi_manager.h",
1183 ] 1172 ]
1184 } 1173 }
1185 } 1174 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698