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

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

Issue 1312813003: add nacl_toolchain to //build and flip to using it in the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@build_changes
Patch Set: merge to #346439 Created 5 years, 3 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/nacl_toolchain.gni ('k') | ppapi/native_client/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 (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/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//testing/test.gni") 8 import("//testing/test.gni")
9 9
10 if (enable_nacl) { 10 if (enable_nacl) {
(...skipping 26 matching lines...) Expand all
37 "//native_client/src/trusted/service_runtime:sel_main_chrome", 37 "//native_client/src/trusted/service_runtime:sel_main_chrome",
38 "//ppapi/c", 38 "//ppapi/c",
39 "//ppapi/proxy:ipc", 39 "//ppapi/proxy:ipc",
40 "//ppapi/shared_impl", 40 "//ppapi/shared_impl",
41 "//third_party/mojo/src/mojo/edk/embedder", 41 "//third_party/mojo/src/mojo/edk/embedder",
42 ] 42 ]
43 43
44 if (enable_nacl_untrusted) { 44 if (enable_nacl_untrusted) {
45 data_deps = [ 45 data_deps = [
46 # TODO(GYP): handle other architectures correctly. 46 # TODO(GYP): handle other architectures correctly.
47 "//ppapi/native_client:nacl_irt(//native_client/build/toolchain/nacl:irt _x64)", 47 "//ppapi/native_client:nacl_irt(//build/toolchain/nacl:irt_x64)",
48 ] 48 ]
49 } 49 }
50 if (enable_pnacl) { 50 if (enable_pnacl) {
51 data_deps += [ 51 data_deps += [
52 # TODO(GYP): handle other architectures correctly. 52 # TODO(GYP): handle other architectures correctly.
53 "//ppapi/native_client/src/untrusted/pnacl_support_extension", 53 "//ppapi/native_client/src/untrusted/pnacl_support_extension",
54 ] 54 ]
55 } 55 }
56 } 56 }
57 57
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 314
315 if (is_linux) { 315 if (is_linux) {
316 sources += [ 316 sources += [
317 "common/nacl_paths.cc", 317 "common/nacl_paths.cc",
318 "common/nacl_paths.h", 318 "common/nacl_paths.h",
319 ] 319 ]
320 320
321 defines = [ "__STDC_LIMIT_MACROS=1" ] 321 defines = [ "__STDC_LIMIT_MACROS=1" ]
322 } 322 }
323 } 323 }
OLDNEW
« no previous file with comments | « build/toolchain/nacl_toolchain.gni ('k') | ppapi/native_client/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698