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

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

Issue 2734973002: Stop setting use_qualified_include to true now that that is the default. (Closed)
Patch Set: Created 3 years, 9 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 | « ash/strings/BUILD.gn ('k') | 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("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//chrome/common/features.gni") 6 import("//chrome/common/features.gni")
7 import("//ppapi/features/features.gni") 7 import("//ppapi/features/features.gni")
8 import("//printing/features/features.gni") 8 import("//printing/features/features.gni")
9 import("//services/catalog/public/tools/catalog.gni") 9 import("//services/catalog/public/tools/catalog.gni")
10 import("//services/service_manager/public/service_manifest.gni") 10 import("//services/service_manager/public/service_manifest.gni")
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 "java/res/values-uk/generated_resources.xml", 96 "java/res/values-uk/generated_resources.xml",
97 "java/res/values-vi/generated_resources.xml", 97 "java/res/values-vi/generated_resources.xml",
98 "java/res/values-zh-rCN/generated_resources.xml", 98 "java/res/values-zh-rCN/generated_resources.xml",
99 "java/res/values-zh-rTW/generated_resources.xml", 99 "java/res/values-zh-rTW/generated_resources.xml",
100 "java/res/values/generated_resources.xml", 100 "java/res/values/generated_resources.xml",
101 ] 101 ]
102 } 102 }
103 103
104 grit("generated_resources") { 104 grit("generated_resources") {
105 source = "generated_resources.grd" 105 source = "generated_resources.grd"
106 use_qualified_include = true
107 defines = chrome_grit_defines 106 defines = chrome_grit_defines
108 output_dir = "$root_gen_dir/chrome" 107 output_dir = "$root_gen_dir/chrome"
109 outputs = [ 108 outputs = [
110 "grit/generated_resources.h", 109 "grit/generated_resources.h",
111 "generated_resources_am.pak", 110 "generated_resources_am.pak",
112 "generated_resources_ar.pak", 111 "generated_resources_ar.pak",
113 "generated_resources_bg.pak", 112 "generated_resources_bg.pak",
114 "generated_resources_bn.pak", 113 "generated_resources_bn.pak",
115 "generated_resources_ca.pak", 114 "generated_resources_ca.pak",
116 "generated_resources_cs.pak", 115 "generated_resources_cs.pak",
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 generated_files = 174 generated_files =
176 rebase_path(android_generated_java_resources, "java/res", ".") 175 rebase_path(android_generated_java_resources, "java/res", ".")
177 deps = [ 176 deps = [
178 ":generated_resources", 177 ":generated_resources",
179 ] 178 ]
180 } 179 }
181 } 180 }
182 181
183 grit("google_chrome_strings") { 182 grit("google_chrome_strings") {
184 source = "google_chrome_strings.grd" 183 source = "google_chrome_strings.grd"
185 use_qualified_include = true
186 defines = chrome_grit_defines 184 defines = chrome_grit_defines
187 output_dir = "$root_gen_dir/chrome" 185 output_dir = "$root_gen_dir/chrome"
188 outputs = [ 186 outputs = [
189 "grit/google_chrome_strings.h", 187 "grit/google_chrome_strings.h",
190 "google_chrome_strings_am.pak", 188 "google_chrome_strings_am.pak",
191 "google_chrome_strings_ar.pak", 189 "google_chrome_strings_ar.pak",
192 "google_chrome_strings_bg.pak", 190 "google_chrome_strings_bg.pak",
193 "google_chrome_strings_bn.pak", 191 "google_chrome_strings_bn.pak",
194 "google_chrome_strings_ca.pak", 192 "google_chrome_strings_ca.pak",
195 "google_chrome_strings_cs.pak", 193 "google_chrome_strings_cs.pak",
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 "google_chrome_strings_uk.pak", 237 "google_chrome_strings_uk.pak",
240 "google_chrome_strings_vi.pak", 238 "google_chrome_strings_vi.pak",
241 "google_chrome_strings_zh-CN.pak", 239 "google_chrome_strings_zh-CN.pak",
242 "google_chrome_strings_zh-TW.pak", 240 "google_chrome_strings_zh-TW.pak",
243 "google_chrome_strings_fake-bidi.pak", 241 "google_chrome_strings_fake-bidi.pak",
244 ] 242 ]
245 } 243 }
246 244
247 grit("chromium_strings") { 245 grit("chromium_strings") {
248 source = "chromium_strings.grd" 246 source = "chromium_strings.grd"
249 use_qualified_include = true
250 defines = chrome_grit_defines 247 defines = chrome_grit_defines
251 output_dir = "$root_gen_dir/chrome" 248 output_dir = "$root_gen_dir/chrome"
252 outputs = [ 249 outputs = [
253 "grit/chromium_strings.h", 250 "grit/chromium_strings.h",
254 "chromium_strings_am.pak", 251 "chromium_strings_am.pak",
255 "chromium_strings_ar.pak", 252 "chromium_strings_ar.pak",
256 "chromium_strings_bg.pak", 253 "chromium_strings_bg.pak",
257 "chromium_strings_bn.pak", 254 "chromium_strings_bn.pak",
258 "chromium_strings_ca.pak", 255 "chromium_strings_ca.pak",
259 "chromium_strings_cs.pak", 256 "chromium_strings_cs.pak",
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 chrome_embedded_services + 493 chrome_embedded_services +
497 [ ":chrome_content_packaged_services_manifest_for_mash" ] 494 [ ":chrome_content_packaged_services_manifest_for_mash" ]
498 } 495 }
499 } 496 }
500 497
501 catalog("catalog") { 498 catalog("catalog") {
502 embedded_services = chrome_embedded_services + 499 embedded_services = chrome_embedded_services +
503 [ ":chrome_content_packaged_services_manifest" ] 500 [ ":chrome_content_packaged_services_manifest" ]
504 } 501 }
505 } 502 }
OLDNEW
« no previous file with comments | « ash/strings/BUILD.gn ('k') | chrome/app/resources/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698