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

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

Issue 877553008: Land prep work to enable NaCl in the Linux x64 GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update w/ review feedback from ncbray Created 5 years, 10 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
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("//build/gypi_to_gn.py", 7 gypi_values = exec_script("//build/gypi_to_gn.py",
8 [ rebase_path("../chrome_common.gypi") ], 8 [ rebase_path("../chrome_common.gypi") ],
9 "scope", 9 "scope",
10 [ "../chrome_common.gypi" ]) 10 [ "../chrome_common.gypi" ])
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 ".", 130 ".",
131 "//chrome") 131 "//chrome")
132 } 132 }
133 } 133 }
134 if (is_mac) { 134 if (is_mac) {
135 sources += 135 sources +=
136 rebase_path(gypi_values.chrome_common_mac_sources, ".", "//chrome") 136 rebase_path(gypi_values.chrome_common_mac_sources, ".", "//chrome")
137 } 137 }
138 138
139 if (enable_nacl) { 139 if (enable_nacl) {
140 deps += [ 140 deps += [ "//components/nacl:nacl_common" ]
141 #'<(DEPTH)/components/nacl.gyp:nacl_common', TODO(GYP)
142 ]
143 } 141 }
144 142
145 # Printing. 143 # Printing.
146 if (enable_basic_printing || enable_print_preview) { 144 if (enable_basic_printing || enable_print_preview) {
147 deps += [ 145 deps += [
148 "//components/printing/common:printing_common", 146 "//components/printing/common:printing_common",
149 "//printing", 147 "//printing",
150 ] 148 ]
151 if (enable_print_preview) { 149 if (enable_print_preview) {
152 # Full printing support. 150 # Full printing support.
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 275
278 deps = [ 276 deps = [
279 ":make_chrome_version", 277 ":make_chrome_version",
280 "//base", 278 "//base",
281 "//base/third_party/dynamic_annotations", 279 "//base/third_party/dynamic_annotations",
282 "//components/bookmarks/common", 280 "//components/bookmarks/common",
283 "//third_party/widevine/cdm:version_h", 281 "//third_party/widevine/cdm:version_h",
284 ] 282 ]
285 283
286 if (enable_nacl) { 284 if (enable_nacl) {
287 deps += [ 285 deps += [ "//components/nacl:nacl_switches" ]
288 #'../components/nacl.gyp:nacl_switches', TODO(GYP)
289 ]
290 } 286 }
291 } 287 }
292 288
293 source_set("test_support") { 289 source_set("test_support") {
294 testonly = true 290 testonly = true
295 visibility = [ "//chrome/test:test_support" ] 291 visibility = [ "//chrome/test:test_support" ]
296 292
297 sources = [] 293 sources = []
298 294
299 deps = [ 295 deps = [
(...skipping 11 matching lines...) Expand all
311 ] 307 ]
312 } 308 }
313 309
314 if (enable_extensions) { 310 if (enable_extensions) {
315 sources += [ 311 sources += [
316 "extensions/extension_test_util.cc", 312 "extensions/extension_test_util.cc",
317 "extensions/extension_test_util.h", 313 "extensions/extension_test_util.h",
318 ] 314 ]
319 } 315 }
320 } 316 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/renderer/BUILD.gn » ('j') | chrome/test/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698