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

Side by Side Diff: build/config/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: Rebase. Created 4 years, 11 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') | build/config/features.gni » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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/allocator.gni") 5 import("//build/config/allocator.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 import("//build/config/chromecast_build.gni") 7 import("//build/config/chromecast_build.gni")
8 import("//build/config/crypto.gni") 8 import("//build/config/crypto.gni")
9 import("//build/config/features.gni") 9 import("//build/config/features.gni")
10 import("//build/config/sanitizers/sanitizers.gni") 10 import("//build/config/sanitizers/sanitizers.gni")
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 defines += [ "OFFICIAL_BUILD" ] 254 defines += [ "OFFICIAL_BUILD" ]
255 } 255 }
256 if (is_chrome_branded) { 256 if (is_chrome_branded) {
257 defines += [ "GOOGLE_CHROME_BUILD" ] 257 defines += [ "GOOGLE_CHROME_BUILD" ]
258 } else { 258 } else {
259 defines += [ "CHROMIUM_BUILD" ] 259 defines += [ "CHROMIUM_BUILD" ]
260 } 260 }
261 if (enable_media_router) { 261 if (enable_media_router) {
262 defines += [ "ENABLE_MEDIA_ROUTER=1" ] 262 defines += [ "ENABLE_MEDIA_ROUTER=1" ]
263 } 263 }
264 if (enable_hotwording) {
265 defines += [ "ENABLE_HOTWORDING" ]
266 }
264 if (enable_webvr) { 267 if (enable_webvr) {
265 defines += [ "ENABLE_WEBVR" ] 268 defines += [ "ENABLE_WEBVR" ]
266 } 269 }
267 if (is_syzyasan) { 270 if (is_syzyasan) {
268 defines += [ 271 defines += [
269 "SYZYASAN", 272 "SYZYASAN",
270 "MEMORY_TOOL_REPLACES_ALLOCATOR", 273 "MEMORY_TOOL_REPLACES_ALLOCATOR",
271 "MEMORY_SANITIZER_INITIAL_SIZE", 274 "MEMORY_SANITIZER_INITIAL_SIZE",
272 ] 275 ]
273 } 276 }
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 # This error doesn't happen every time. In VS2013, it seems if the .pch 475 # This error doesn't happen every time. In VS2013, it seems if the .pch
473 # file doesn't exist, no error will be generated (probably MS tested this 476 # file doesn't exist, no error will be generated (probably MS tested this
474 # case but forgot the other one?). To reproduce this error, do a build, 477 # case but forgot the other one?). To reproduce this error, do a build,
475 # then delete the precompile.c.obj file, then build again. 478 # then delete the precompile.c.obj file, then build again.
476 cflags_c = [ "/wd4206" ] 479 cflags_c = [ "/wd4206" ]
477 } else if (is_mac && !is_official_build && !use_goma) { 480 } else if (is_mac && !is_official_build && !use_goma) {
478 precompiled_header = "build/precompile.h" 481 precompiled_header = "build/precompile.h"
479 precompiled_source = "//build/precompile.h" 482 precompiled_source = "//build/precompile.h"
480 } 483 }
481 } 484 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | build/config/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698