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

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: Same fix for GN builds. Created 5 years, 6 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/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//build/module_args/v8.gni") 10 import("//build/module_args/v8.gni")
(...skipping 19 matching lines...) Expand all
30 dcheck_always_on = false 30 dcheck_always_on = false
31 31
32 # Set to true to compile with the OpenGL ES 2.0 conformance tests. 32 # Set to true to compile with the OpenGL ES 2.0 conformance tests.
33 internal_gles2_conform_tests = false 33 internal_gles2_conform_tests = false
34 } 34 }
35 35
36 # TODO(brettw) Most of these should be removed. Instead of global feature 36 # TODO(brettw) Most of these should be removed. Instead of global feature
37 # flags, we should have more modular flags that apply only to a target and its 37 # flags, we should have more modular flags that apply only to a target and its
38 # dependents. For example, depending on the "x11" meta-target should define 38 # dependents. For example, depending on the "x11" meta-target should define
39 # USE_X11 for all dependents so that everything that could use X11 gets the 39 # USE_X11 for all dependents so that everything that could use X11 gets the
40 # define, but anything that doesn't depend on X11 doesn't see it. 40 # define, but anything that doesn't depend on X11 doesn't see it.
Nico 2015/06/24 19:34:04 Have you seen this comment? Is it possible to do s
Matt Giuca 2015/06/25 03:13:18 No I didn't see that before, sorry. This sounds l
41 # 41 #
42 # For now we define these globally to match the current GYP build. 42 # For now we define these globally to match the current GYP build.
43 config("feature_flags") { 43 config("feature_flags") {
44 # TODO(brettw) this probably needs to be parameterized. 44 # TODO(brettw) this probably needs to be parameterized.
45 defines = [ "V8_DEPRECATION_WARNINGS" ] # Don't use deprecated V8 APIs anywhe re. 45 defines = [ "V8_DEPRECATION_WARNINGS" ] # Don't use deprecated V8 APIs anywhe re.
46 46
47 if (cld_version > 0) { 47 if (cld_version > 0) {
48 defines += [ "CLD_VERSION=$cld_version" ] 48 defines += [ "CLD_VERSION=$cld_version" ]
49 } 49 }
50 if (enable_mdns) { 50 if (enable_mdns) {
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 defines += [ "OFFICIAL_BUILD" ] 265 defines += [ "OFFICIAL_BUILD" ]
266 } 266 }
267 if (is_chrome_branded) { 267 if (is_chrome_branded) {
268 defines += [ "GOOGLE_CHROME_BUILD" ] 268 defines += [ "GOOGLE_CHROME_BUILD" ]
269 } else { 269 } else {
270 defines += [ "CHROMIUM_BUILD" ] 270 defines += [ "CHROMIUM_BUILD" ]
271 } 271 }
272 if (enable_media_router) { 272 if (enable_media_router) {
273 defines += [ "ENABLE_MEDIA_ROUTER=1" ] 273 defines += [ "ENABLE_MEDIA_ROUTER=1" ]
274 } 274 }
275 if (enable_hotwording) {
276 defines += [ "ENABLE_HOTWORDING" ]
277 }
275 } 278 }
276 279
277 # Debug/release ---------------------------------------------------------------- 280 # Debug/release ----------------------------------------------------------------
278 281
279 config("debug") { 282 config("debug") {
280 defines = [ 283 defines = [
281 "_DEBUG", 284 "_DEBUG",
282 "DYNAMIC_ANNOTATIONS_ENABLED=1", 285 "DYNAMIC_ANNOTATIONS_ENABLED=1",
283 "WTF_USE_DYNAMIC_ANNOTATIONS=1", 286 "WTF_USE_DYNAMIC_ANNOTATIONS=1",
284 ] 287 ]
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 "CoreFoundation.framework", 392 "CoreFoundation.framework",
390 "CoreGraphics.framework", 393 "CoreGraphics.framework",
391 "CoreText.framework", 394 "CoreText.framework",
392 "Foundation.framework", 395 "Foundation.framework",
393 "UIKit.framework", 396 "UIKit.framework",
394 ] 397 ]
395 } else if (is_linux) { 398 } else if (is_linux) {
396 libs = [ "dl" ] 399 libs = [ "dl" ]
397 } 400 }
398 } 401 }
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