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

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

Issue 2204343004: Revert of Expand scope of enable_hotwording. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « no previous file | chrome/browser/extensions/BUILD.gn » ('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("//build/split_static_library.gni") 9 import("//build/split_static_library.gni")
10 import("//chrome/common/features.gni") 10 import("//chrome/common/features.gni")
11 import("//media/media_options.gni") 11 import("//media/media_options.gni")
12 import("//third_party/protobuf/proto_library.gni") 12 import("//third_party/protobuf/proto_library.gni")
13 13
14 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 14 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
15 # produces a conflict for the "grit" template so we have to only include one. 15 # produces a conflict for the "grit" template so we have to only include one.
16 if (is_android) { 16 if (is_android) {
17 import("//build/config/android/rules.gni") 17 import("//build/config/android/rules.gni")
18 } else { 18 } else {
19 import("//tools/grit/grit_rule.gni") 19 import("//tools/grit/grit_rule.gni")
20 } 20 }
21 if (is_desktop_linux) { 21 if (is_desktop_linux) {
22 import("//build/config/linux/pkg_config.gni") 22 import("//build/config/linux/pkg_config.gni")
23 } 23 }
24 24
25 declare_args() {
26 # 'Ok Google' hotwording is disabled by default. Set to true to enable. (This
27 # will download a closed-source NaCl module at startup.) Chrome-branded
28 # ChromeOS builds have this enabled by default.
29 enable_hotwording = is_chrome_branded && is_chromeos
30 }
31
25 additional_modules_list_file = 32 additional_modules_list_file =
26 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt" 33 "$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
27 34
28 gypi_values = exec_script("//build/gypi_to_gn.py", 35 gypi_values = exec_script("//build/gypi_to_gn.py",
29 [ rebase_path("../chrome_browser.gypi") ], 36 [ rebase_path("../chrome_browser.gypi") ],
30 "scope", 37 "scope",
31 [ "../chrome_browser.gypi" ]) 38 [ "../chrome_browser.gypi" ])
32 39
33 if (is_win) { 40 if (is_win) {
34 # This is in a separate config so the flags can be applied to dependents. 41 # This is in a separate config so the flags can be applied to dependents.
(...skipping 1333 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 # linking all of the test support. 1375 # linking all of the test support.
1369 static_library("pepper_cdm_test_constants") { 1376 static_library("pepper_cdm_test_constants") {
1370 testonly = true 1377 testonly = true
1371 visibility = [ "//chrome/*" ] 1378 visibility = [ "//chrome/*" ]
1372 sources = [ 1379 sources = [
1373 "media/pepper_cdm_test_constants.cc", 1380 "media/pepper_cdm_test_constants.cc",
1374 "media/pepper_cdm_test_constants.h", 1381 "media/pepper_cdm_test_constants.h",
1375 ] 1382 ]
1376 } 1383 }
1377 } 1384 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698