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

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

Issue 1211273003: Disable "Ok Google" hotwording in open source builds by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hotword-clarify-labels
Patch Set: Rebase properly. 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_unittest.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() { 21 declare_args() {
22 # 'Ok Google' hotwording is enabled. 22 # 'Ok Google' hotwording is disabled by default in open source builds. Set to
23 enable_hotwording = true 23 # true to enable. (This will download a closed-source NaCl module at startup.)
24 # Chrome-branded builds have this enabled by default.
25 enable_hotwording = is_chrome_branded
24 } 26 }
25 27
26 about_credits_file = "$target_gen_dir/about_credits.html" 28 about_credits_file = "$target_gen_dir/about_credits.html"
27 additional_modules_list_file = 29 additional_modules_list_file =
28 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt" 30 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
29 31
30 gypi_values = exec_script("//build/gypi_to_gn.py", 32 gypi_values = exec_script("//build/gypi_to_gn.py",
31 [ rebase_path("../chrome_browser.gypi") ], 33 [ rebase_path("../chrome_browser.gypi") ],
32 "scope", 34 "scope",
33 [ "../chrome_browser.gypi" ]) 35 [ "../chrome_browser.gypi" ])
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 ] 1151 ]
1150 } 1152 }
1151 1153
1152 if (enable_wifi_bootstrapping) { 1154 if (enable_wifi_bootstrapping) {
1153 sources += [ 1155 sources += [
1154 "local_discovery/wifi/mock_wifi_manager.cc", 1156 "local_discovery/wifi/mock_wifi_manager.cc",
1155 "local_discovery/wifi/mock_wifi_manager.h", 1157 "local_discovery/wifi/mock_wifi_manager.h",
1156 ] 1158 ]
1157 } 1159 }
1158 } 1160 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/search/hotword_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698