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

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

Issue 468733003: GN: Fix build after r289163 / r289149. (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 | « no previous file | chrome/app/resources/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 # GYP version: chrome/chrome_resources.gyp:chrome_strings 7 # GYP version: chrome/chrome_resources.gyp:chrome_strings
8 # (generate_generated_resources action) 8 # (generate_generated_resources action)
9 grit("generated_resources") { 9 grit("generated_resources") {
10 source = "generated_resources.grd" 10 source = "generated_resources.grd"
11 output_dir = "$root_gen_dir/chrome"
11 outputs = [ 12 outputs = [
12 "grit/generated_resources.h", 13 "grit/generated_resources.h",
13 "generated_resources_am.pak", 14 "generated_resources_am.pak",
14 "generated_resources_ar.pak", 15 "generated_resources_ar.pak",
15 "generated_resources_bg.pak", 16 "generated_resources_bg.pak",
16 "generated_resources_bn.pak", 17 "generated_resources_bn.pak",
17 "generated_resources_ca.pak", 18 "generated_resources_ca.pak",
18 "generated_resources_cs.pak", 19 "generated_resources_cs.pak",
19 "generated_resources_da.pak", 20 "generated_resources_da.pak",
20 "generated_resources_de.pak", 21 "generated_resources_de.pak",
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 ] 68 ]
68 } 69 }
69 70
70 # GYP version: chrome/chrome_resources.gyp:chrome_strings_map 71 # GYP version: chrome/chrome_resources.gyp:chrome_strings_map
71 action("make_generated_resources_map") { 72 action("make_generated_resources_map") {
72 # Targets should depend on generated_resources_map instead. 73 # Targets should depend on generated_resources_map instead.
73 visibility = ":generated_resources_map" 74 visibility = ":generated_resources_map"
74 75
75 script = "//chrome/browser/metrics/variations/generate_resources_map.py" 76 script = "//chrome/browser/metrics/variations/generate_resources_map.py"
76 77
77 inputs = [ "$target_gen_dir/grit/generated_resources.h" ] 78 inputs = [ "$root_gen_dir/chrome/grit/generated_resources.h" ]
78 outputs = [ "$target_gen_dir/generated_resources_map.cc" ] 79 outputs = [ "$root_gen_dir/chrome/generated_resources_map.cc" ]
79 80
80 args = rebase_path(inputs, root_build_dir) + 81 args = rebase_path(inputs, root_build_dir) +
81 rebase_path(outputs, root_build_dir) 82 rebase_path(outputs, root_build_dir)
82 83
83 deps = [ ":generated_resources" ] 84 deps = [ ":generated_resources" ]
84 } 85 }
85 86
86 # Collect the generated .cc file from make_generated_resources_map and put it 87 # Collect the generated .cc file from make_generated_resources_map and put it
87 # in a source set so targets that depend on it will link the source rather than 88 # in a source set so targets that depend on it will link the source rather than
88 # specifying it manually. This doesn't happen in the GYP build. 89 # specifying it manually. This doesn't happen in the GYP build.
89 source_set("generated_resources_map") { 90 source_set("generated_resources_map") {
90 sources = get_target_outputs(":make_generated_resources_map") 91 sources = get_target_outputs(":make_generated_resources_map")
91 } 92 }
92 93
93 # GYP version: chrome/chrome_resources.gyp:chrome_strings 94 # GYP version: chrome/chrome_resources.gyp:chrome_strings
94 # (generate_google_chrome_strings action) 95 # (generate_google_chrome_strings action)
95 grit("google_chrome_strings") { 96 grit("google_chrome_strings") {
96 source = "google_chrome_strings.grd" 97 source = "google_chrome_strings.grd"
98 output_dir = "$root_gen_dir/chrome"
97 outputs = [ 99 outputs = [
98 "grit/google_chrome_strings.h", 100 "grit/google_chrome_strings.h",
99 "google_chrome_strings_am.pak", 101 "google_chrome_strings_am.pak",
100 "google_chrome_strings_ar.pak", 102 "google_chrome_strings_ar.pak",
101 "google_chrome_strings_bg.pak", 103 "google_chrome_strings_bg.pak",
102 "google_chrome_strings_bn.pak", 104 "google_chrome_strings_bn.pak",
103 "google_chrome_strings_ca.pak", 105 "google_chrome_strings_ca.pak",
104 "google_chrome_strings_cs.pak", 106 "google_chrome_strings_cs.pak",
105 "google_chrome_strings_da.pak", 107 "google_chrome_strings_da.pak",
106 "google_chrome_strings_de.pak", 108 "google_chrome_strings_de.pak",
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 "google_chrome_strings_zh-CN.pak", 152 "google_chrome_strings_zh-CN.pak",
151 "google_chrome_strings_zh-TW.pak", 153 "google_chrome_strings_zh-TW.pak",
152 "google_chrome_strings_fake-bidi.pak", 154 "google_chrome_strings_fake-bidi.pak",
153 ] 155 ]
154 } 156 }
155 157
156 # GYP version: chrome/chrome_resources.gyp:chrome_strings 158 # GYP version: chrome/chrome_resources.gyp:chrome_strings
157 # (generate_chromium_strings action) 159 # (generate_chromium_strings action)
158 grit("chromium_strings") { 160 grit("chromium_strings") {
159 source = "chromium_strings.grd" 161 source = "chromium_strings.grd"
162 output_dir = "$root_gen_dir/chrome"
160 outputs = [ 163 outputs = [
161 "grit/chromium_strings.h", 164 "grit/chromium_strings.h",
162 "chromium_strings_am.pak", 165 "chromium_strings_am.pak",
163 "chromium_strings_ar.pak", 166 "chromium_strings_ar.pak",
164 "chromium_strings_bg.pak", 167 "chromium_strings_bg.pak",
165 "chromium_strings_bn.pak", 168 "chromium_strings_bn.pak",
166 "chromium_strings_ca.pak", 169 "chromium_strings_ca.pak",
167 "chromium_strings_cs.pak", 170 "chromium_strings_cs.pak",
168 "chromium_strings_da.pak", 171 "chromium_strings_da.pak",
169 "chromium_strings_de.pak", 172 "chromium_strings_de.pak",
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 "chromium_strings_ta.pak", 211 "chromium_strings_ta.pak",
209 "chromium_strings_te.pak", 212 "chromium_strings_te.pak",
210 "chromium_strings_th.pak", 213 "chromium_strings_th.pak",
211 "chromium_strings_tr.pak", 214 "chromium_strings_tr.pak",
212 "chromium_strings_uk.pak", 215 "chromium_strings_uk.pak",
213 "chromium_strings_vi.pak", 216 "chromium_strings_vi.pak",
214 "chromium_strings_zh-CN.pak", 217 "chromium_strings_zh-CN.pak",
215 "chromium_strings_zh-TW.pak", 218 "chromium_strings_zh-TW.pak",
216 ] 219 ]
217 } 220 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/resources/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698