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

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

Issue 461213003: Revert of GN: Specify grit generated output paths to be the same as gyp's. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/renderer/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("//tools/grit/grit_rule.gni") 5 import("//tools/grit/grit_rule.gni")
6 6
7 gypi_values = exec_script( 7 gypi_values = exec_script(
8 "//build/gypi_to_gn.py", 8 "//build/gypi_to_gn.py",
9 [ rebase_path("../chrome_common.gypi") ], 9 [ rebase_path("../chrome_common.gypi") ],
10 "scope", 10 "scope",
11 [ "../chrome_common.gypi" ]) 11 [ "../chrome_common.gypi" ])
12 12
13 # GYP version: chrome/chrome_resources.gyp:chrome_resources 13 # GYP version: chrome/chrome_resources.gyp:chrome_resources
14 # (generate_common_resources action) 14 # (generate_common_resources action)
15 grit("resources") { 15 grit("resources") {
16 source = "common_resources.grd" 16 source = "common_resources.grd"
17 output_dir = "$root_gen_dir/chrome"
18 outputs = [ 17 outputs = [
19 "grit/common_resources.h", 18 "grit/common_resources.h",
20 "common_resources.pak", 19 "common_resources.pak",
21 ] 20 ]
22 } 21 }
23 22
24 # GYP version: chrome/chrome_resources.gyp:chrome_resources 23 # GYP version: chrome/chrome_resources.gyp:chrome_resources
25 # (generate_extensions_api_resources action) 24 # (generate_extensions_api_resources action)
26 grit("extensions_api_resources") { 25 grit("extensions_api_resources") {
27 source = "extensions_api_resources.grd" 26 source = "extensions_api_resources.grd"
28 output_dir = "$root_gen_dir/chrome"
29 outputs = [ 27 outputs = [
30 "grit/extensions_api_resources.h", 28 "grit/extensions_api_resources.h",
31 "extensions_api_resources.pak", 29 "extensions_api_resources.pak",
32 ] 30 ]
33 } 31 }
34 32
35 # GYP version: chrome/chrome_common.gyp:common 33 # GYP version: chrome/chrome_common.gyp:common
36 static_library("common") { 34 static_library("common") {
37 sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome") 35 sources = rebase_path(gypi_values.chrome_common_sources, ".", "//chrome")
38 defines = [] 36 defines = []
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 "//components/bookmarks/common", 300 "//components/bookmarks/common",
303 "//third_party/widevine/cdm:version_h", 301 "//third_party/widevine/cdm:version_h",
304 ] 302 ]
305 303
306 if (enable_nacl) { 304 if (enable_nacl) {
307 deps += [ 305 deps += [
308 #'../components/nacl.gyp:nacl_switches', TODO(GYP) 306 #'../components/nacl.gyp:nacl_switches', TODO(GYP)
309 ] 307 ]
310 } 308 }
311 } 309 }
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698