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

Side by Side Diff: components/nacl/BUILD.gn

Issue 1017273002: Remove old references to cpu_arch, os from GN files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to #322476 Created 5 years, 8 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 | « build/toolchain/win/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2015 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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 if (enable_nacl) { 9 if (enable_nacl) {
10 source_set("nacl") { 10 source_set("nacl") {
(...skipping 19 matching lines...) Expand all
30 "//base:base_static", 30 "//base:base_static",
31 "//ipc", 31 "//ipc",
32 "//mojo/nacl:monacl_sel", 32 "//mojo/nacl:monacl_sel",
33 "//native_client/src/trusted/service_runtime:sel_main_chrome", 33 "//native_client/src/trusted/service_runtime:sel_main_chrome",
34 "//ppapi/proxy:ipc", 34 "//ppapi/proxy:ipc",
35 "//ppapi/shared_impl", 35 "//ppapi/shared_impl",
36 ] 36 ]
37 37
38 if (enable_nacl_untrusted) { 38 if (enable_nacl_untrusted) {
39 data_deps = [ 39 data_deps = [
40 # TODO(GYP): handle other cpu_arch's correctly. 40 # TODO(GYP): handle other architectures correctly.
41 "//ppapi/native_client:nacl_irt(//native_client/build/toolchain/nacl:irt _x64)", 41 "//ppapi/native_client:nacl_irt(//native_client/build/toolchain/nacl:irt _x64)",
42 ] 42 ]
43 } 43 }
44 if (enable_pnacl) { 44 if (enable_pnacl) {
45 data_deps += [ 45 data_deps += [
46 # TODO(GYP): handle other cpu_arch's correctly. 46 # TODO(GYP): handle other architectures correctly.
47 "//ppapi/native_client/src/untrusted/pnacl_support_extension", 47 "//ppapi/native_client/src/untrusted/pnacl_support_extension",
48 ] 48 ]
49 } 49 }
50 } 50 }
51 51
52 source_set("nacl_browser") { 52 source_set("nacl_browser") {
53 sources = [ 53 sources = [
54 "browser/nacl_broker_host_win.cc", 54 "browser/nacl_broker_host_win.cc",
55 "browser/nacl_broker_host_win.h", 55 "browser/nacl_broker_host_win.h",
56 "browser/nacl_broker_service_win.cc", 56 "browser/nacl_broker_service_win.cc",
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 259
260 if (is_linux) { 260 if (is_linux) {
261 sources += [ 261 sources += [
262 "common/nacl_paths.cc", 262 "common/nacl_paths.cc",
263 "common/nacl_paths.h", 263 "common/nacl_paths.h",
264 ] 264 ]
265 265
266 defines = [ "__STDC_LIMIT_MACROS=1" ] 266 defines = [ "__STDC_LIMIT_MACROS=1" ]
267 } 267 }
268 } 268 }
OLDNEW
« no previous file with comments | « build/toolchain/win/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698