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

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

Issue 1264973002: Disable 'Ok Google' hotwording on desktop Chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix syntax errors. Created 5 years, 4 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') | 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 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() { 22 declare_args() {
23 # 'Ok Google' hotwording is disabled by default in open source builds. Set to 23 # 'Ok Google' hotwording is disabled by default. Set to true to enable. (This
24 # true to enable. (This will download a closed-source NaCl module at startup.) 24 # will download a closed-source NaCl module at startup.) Chrome-branded
25 # Chrome-branded builds have this enabled by default. 25 # ChromeOS builds have this enabled by default.
26 enable_hotwording = is_chrome_branded 26 enable_hotwording = is_chrome_branded && is_chromeos
27 } 27 }
28 28
29 about_credits_file = "$target_gen_dir/about_credits.html" 29 about_credits_file = "$target_gen_dir/about_credits.html"
30 additional_modules_list_file = 30 additional_modules_list_file =
31 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt" 31 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
32 32
33 gypi_values = exec_script("//build/gypi_to_gn.py", 33 gypi_values = exec_script("//build/gypi_to_gn.py",
34 [ rebase_path("../chrome_browser.gypi") ], 34 [ rebase_path("../chrome_browser.gypi") ],
35 "scope", 35 "scope",
36 [ "../chrome_browser.gypi" ]) 36 [ "../chrome_browser.gypi" ])
(...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") 1204 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
1205 deps = [ 1205 deps = [
1206 "//components/google/core/browser", 1206 "//components/google/core/browser",
1207 "//components/omnibox/browser", 1207 "//components/omnibox/browser",
1208 "//components/rlz", 1208 "//components/rlz",
1209 "//components/search_engines", 1209 "//components/search_engines",
1210 "//rlz:rlz_lib", 1210 "//rlz:rlz_lib",
1211 ] 1211 ]
1212 } 1212 }
1213 } 1213 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698