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

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

Issue 1458653002: 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 | « build/write_buildflag_header.py ('k') | chrome/browser/extensions/component_loader.cc » ('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("//chrome/common/features.gni")
9 import("//media/media_options.gni") 10 import("//media/media_options.gni")
10 import("//third_party/protobuf/proto_library.gni") 11 import("//third_party/protobuf/proto_library.gni")
11 12
12 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which 13 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
13 # produces a conflict for the "grit" template so we have to only include one. 14 # produces a conflict for the "grit" template so we have to only include one.
14 if (is_android) { 15 if (is_android) {
15 import("//build/config/android/rules.gni") 16 import("//build/config/android/rules.gni")
16 } else { 17 } else {
17 import("//tools/grit/grit_rule.gni") 18 import("//tools/grit/grit_rule.gni")
18 } 19 }
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 if (enable_configuration_policy) { 951 if (enable_configuration_policy) {
951 deps += [ "//chrome/browser/policy:path_parser" ] 952 deps += [ "//chrome/browser/policy:path_parser" ]
952 } 953 }
953 } 954 }
954 } 955 }
955 956
956 # GYP version: chrome/chrome_resources.gyp:chrome_resources 957 # GYP version: chrome/chrome_resources.gyp:chrome_resources
957 # (generate_browser_resources action) 958 # (generate_browser_resources action)
958 grit("resources") { 959 grit("resources") {
959 source = "browser_resources.grd" 960 source = "browser_resources.grd"
961 defines = chrome_grit_defines
960 output_dir = "$root_gen_dir/chrome" 962 output_dir = "$root_gen_dir/chrome"
961 outputs = [ 963 outputs = [
962 "grit/browser_resources.h", 964 "grit/browser_resources.h",
963 "browser_resources.pak", 965 "browser_resources.pak",
964 ] 966 ]
965 967
966 grit_flags = [ 968 grit_flags = [
967 "-E", 969 "-E",
968 "additional_modules_list_file=" + 970 "additional_modules_list_file=" +
969 rebase_path(additional_modules_list_file, root_build_dir), 971 rebase_path(additional_modules_list_file, root_build_dir),
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") 1275 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
1274 deps = [ 1276 deps = [
1275 "//components/google/core/browser", 1277 "//components/google/core/browser",
1276 "//components/omnibox/browser", 1278 "//components/omnibox/browser",
1277 "//components/rlz", 1279 "//components/rlz",
1278 "//components/search_engines", 1280 "//components/search_engines",
1279 "//rlz:rlz_lib", 1281 "//rlz:rlz_lib",
1280 ] 1282 ]
1281 } 1283 }
1282 } 1284 }
OLDNEW
« no previous file with comments | « build/write_buildflag_header.py ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698