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

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

Issue 1134753011: Fix missing GN dependencies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « chrome/BUILD.gn ('k') | chrome/browser/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 if (is_android) { 7 if (is_android) {
8 import("//build/config/android/rules.gni") 8 import("//build/config/android/rules.gni")
9 android_generated_java_resources = [ 9 android_generated_java_resources = [
10 "java/res/values-am/generated_resources.xml", 10 "java/res/values-am/generated_resources.xml",
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 deps = [ 151 deps = [
152 ":generated_resources", 152 ":generated_resources",
153 ] 153 ]
154 } 154 }
155 155
156 # Collect the generated .cc file from make_generated_resources_map and put it 156 # Collect the generated .cc file from make_generated_resources_map and put it
157 # in a source set so targets that depend on it will link the source rather than 157 # in a source set so targets that depend on it will link the source rather than
158 # specifying it manually. This doesn't happen in the GYP build. 158 # specifying it manually. This doesn't happen in the GYP build.
159 source_set("generated_resources_map") { 159 source_set("generated_resources_map") {
160 sources = get_target_outputs(":make_generated_resources_map") 160 sources = get_target_outputs(":make_generated_resources_map")
161 deps = [
162 ":make_generated_resources_map",
163 ]
161 } 164 }
162 165
163 # GYP version: chrome/chrome_resources.gyp:chrome_strings 166 # GYP version: chrome/chrome_resources.gyp:chrome_strings
164 # (generate_google_chrome_strings action) 167 # (generate_google_chrome_strings action)
165 grit("google_chrome_strings") { 168 grit("google_chrome_strings") {
166 source = "google_chrome_strings.grd" 169 source = "google_chrome_strings.grd"
167 output_dir = "$root_gen_dir/chrome" 170 output_dir = "$root_gen_dir/chrome"
168 use_qualified_include = true 171 use_qualified_include = true
169 outputs = [ 172 outputs = [
170 "grit/google_chrome_strings.h", 173 "grit/google_chrome_strings.h",
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 } 322 }
320 323
321 if (enable_plugins && enable_nacl) { 324 if (enable_plugins && enable_nacl) {
322 deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ] 325 deps += [ "//components/nacl/renderer/plugin:nacl_trusted_plugin" ]
323 } 326 }
324 327
325 if (enable_remoting) { 328 if (enable_remoting) {
326 deps += [ "//remoting/client/plugin" ] 329 deps += [ "//remoting/client/plugin" ]
327 } 330 }
328 } 331 }
OLDNEW
« no previous file with comments | « chrome/BUILD.gn ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698