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

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

Issue 1480693003: Revert of New build flag system, convert Google Now flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « chrome/chrome_utility.gypi ('k') | chrome/common/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 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/buildflag_header.gni")
6 import("//chrome/common/features.gni")
7 import("//chrome/version.gni") 5 import("//chrome/version.gni")
8 import("//mojo/public/tools/bindings/mojom.gni") 6 import("//mojo/public/tools/bindings/mojom.gni")
9 import("//tools/grit/grit_rule.gni") 7 import("//tools/grit/grit_rule.gni")
10 8
11 gypi_values = exec_script("//build/gypi_to_gn.py", 9 gypi_values = exec_script("//build/gypi_to_gn.py",
12 [ rebase_path("../chrome_common.gypi") ], 10 [ rebase_path("../chrome_common.gypi") ],
13 "scope", 11 "scope",
14 [ "../chrome_common.gypi" ]) 12 [ "../chrome_common.gypi" ])
15 13
16 # GYP version: chrome/chrome_resources.gyp:chrome_resources 14 # GYP version: chrome/chrome_resources.gyp:chrome_resources
(...skipping 14 matching lines...) Expand all
31 grit("extensions_api_resources") { 29 grit("extensions_api_resources") {
32 source = "extensions_api_resources.grd" 30 source = "extensions_api_resources.grd"
33 output_dir = "$root_gen_dir/chrome" 31 output_dir = "$root_gen_dir/chrome"
34 outputs = [ 32 outputs = [
35 "grit/extensions_api_resources.h", 33 "grit/extensions_api_resources.h",
36 "extensions_api_resources.pak", 34 "extensions_api_resources.pak",
37 ] 35 ]
38 } 36 }
39 } 37 }
40 38
41 buildflag_header("features") {
42 header = "features.h"
43 flags = [ "ENABLE_GOOGLE_NOW=$enable_google_now" ]
44 }
45
46 # GYP version: chrome/chrome_common.gypi:common 39 # GYP version: chrome/chrome_common.gypi:common
47 static_library("common") { 40 static_library("common") {
48 sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome") 41 sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome")
49 defines = [] 42 defines = []
50 43
51 configs += [ 44 configs += [
52 "//build/config:precompiled_headers", 45 "//build/config:precompiled_headers",
53 "//build/config/compiler:wexit_time_destructors", 46 "//build/config/compiler:wexit_time_destructors",
54 ] 47 ]
55 48
56 public_deps = [ 49 public_deps = [
57 ":features",
58 "//base:base", 50 "//base:base",
59 "//base:base_static", 51 "//base:base_static",
60 "//base:i18n", 52 "//base:i18n",
61 "//base:prefs", 53 "//base:prefs",
62 "//chrome:resources", 54 "//chrome:resources",
63 "//chrome:strings", 55 "//chrome:strings",
64 "//chrome/app/theme:theme_resources", 56 "//chrome/app/theme:theme_resources",
65 "//chrome/common:constants", 57 "//chrome/common:constants",
66 "//chrome/common/safe_browsing:proto", 58 "//chrome/common/safe_browsing:proto",
67 "//chrome/common/variations:fieldtrial_testing_config", 59 "//chrome/common/variations:fieldtrial_testing_config",
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 "pref_font_script_names-inl.h", 308 "pref_font_script_names-inl.h",
317 "pref_font_webkit_names.h", 309 "pref_font_webkit_names.h",
318 "pref_names.cc", 310 "pref_names.cc",
319 "pref_names.h", 311 "pref_names.h",
320 ] 312 ]
321 313
322 public_deps = [ 314 public_deps = [
323 "//content/public/common:result_codes", 315 "//content/public/common:result_codes",
324 ] 316 ]
325 deps = [ 317 deps = [
326 ":features",
327 ":version_header", 318 ":version_header",
328 "//base", 319 "//base",
329 "//base/third_party/dynamic_annotations", 320 "//base/third_party/dynamic_annotations",
330 "//components/bookmarks/common", 321 "//components/bookmarks/common",
331 "//third_party/widevine/cdm:version_h", 322 "//third_party/widevine/cdm:version_h",
332 ] 323 ]
333 324
334 if (enable_nacl) { 325 if (enable_nacl) {
335 deps += [ "//components/nacl:nacl_switches" ] 326 deps += [ "//components/nacl:nacl_switches" ]
336 } 327 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 ":constants", 385 ":constants",
395 "//base", 386 "//base",
396 ] 387 ]
397 } 388 }
398 389
399 mojom("mojo_bindings") { 390 mojom("mojo_bindings") {
400 sources = [ 391 sources = [
401 "resource_usage_reporter.mojom", 392 "resource_usage_reporter.mojom",
402 ] 393 ]
403 } 394 }
OLDNEW
« no previous file with comments | « chrome/chrome_utility.gypi ('k') | chrome/common/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698