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

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

Issue 954383002: Enable NaCl on the Linux GN x64 release build (only). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make sure the mojo/nacl targets have the "right" include dirs set Created 5 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 | « build/config/features.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.
2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file.
4
5 # TODO(dpranke) - it's very dangerous to have files being built with one
6 # toolchain having as part of the include_dirs a path to another toolchain's
7 # gen/ directory; it would be easy to end up including files meant for a
8 # different toolchain. We should either change this code to generate the
9 # files in every toolchain, or check in the generated code. Currently
10 # the plan is to do the latter.
11
1 # All toolchains use the same generated code. 12 # All toolchains use the same generated code.
2 gen_dir = "$root_build_dir/gen/mojo/nacl" 13 gen_dir = "$root_build_dir/gen/mojo/nacl"
3 14
15 config("mojo_nacl") {
16 include_dirs = [ "$root_build_dir/gen" ]
17 }
18
4 # Only allow the generator to be run by one toolchain. 19 # Only allow the generator to be run by one toolchain.
5 if (current_toolchain == default_toolchain) { 20 if (current_toolchain == default_toolchain) {
6 # Generate the code to plumb the Mojo public API into the NaCl sandbox. 21 # Generate the code to plumb the Mojo public API into the NaCl sandbox.
7 action("mojo_nacl_codegen") { 22 action("mojo_nacl_codegen") {
8 script = "generator/generate_nacl_bindings.py" 23 script = "generator/generate_nacl_bindings.py"
9 args = [ 24 args = [
10 "-d", 25 "-d",
11 rebase_path(gen_dir, root_build_dir), 26 rebase_path(gen_dir, root_build_dir),
12 ] 27 ]
13 inputs = [ 28 inputs = [
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 66
52 # Untrusted code 67 # Untrusted code
53 if (is_nacl) { 68 if (is_nacl) {
54 # Thunk mapping the Mojo public API onto NaCl syscalls. 69 # Thunk mapping the Mojo public API onto NaCl syscalls.
55 static_library("mojo") { 70 static_library("mojo") {
56 sources = [ 71 sources = [
57 "$gen_dir/libmojo.cc", 72 "$gen_dir/libmojo.cc",
58 "$gen_dir/mojo_irt.h", 73 "$gen_dir/mojo_irt.h",
59 ] 74 ]
60 75
61 public_configs = 76 public_configs = [
62 [ "//third_party/mojo/src/mojo/public/build/config:mojo_sdk" ] 77 ":mojo_nacl",
78 "//third_party/mojo/src/mojo/public/build/config:mojo_sdk",
79 ]
63 80
64 public_deps = [ 81 public_deps = [
65 ":mojo_nacl_codegen($default_toolchain)", 82 ":mojo_nacl_codegen($default_toolchain)",
66 ] 83 ]
67 } 84 }
68 85
69 source_set("irt_mojo_sources") { 86 source_set("irt_mojo_sources") {
70 cflags_c = [ "-std=c99" ] 87 cflags_c = [ "-std=c99" ]
71 sources = [ 88 sources = [
72 "$gen_dir/mojo_irt.c", 89 "$gen_dir/mojo_irt.c",
73 "$gen_dir/mojo_irt.h", 90 "$gen_dir/mojo_irt.h",
74 ] 91 ]
92
93 public_configs = [
94 ":mojo_nacl",
95 "//third_party/mojo/src/mojo/public/build/config:mojo_sdk",
96 ]
97
75 public_deps = [ 98 public_deps = [
76 "//native_client/build/config/nacl:nacl_base", 99 "//native_client/build/config/nacl:nacl_base",
77 "//native_client/src/untrusted/irt:irt_core_lib", 100 "//native_client/src/untrusted/irt:irt_core_lib",
78 "//native_client/src/untrusted/nacl:imc_syscalls", 101 "//native_client/src/untrusted/nacl:imc_syscalls",
79 ":mojo_nacl_codegen($default_toolchain)", 102 ":mojo_nacl_codegen($default_toolchain)",
80 ] 103 ]
81 } 104 }
82 } 105 }
OLDNEW
« no previous file with comments | « build/config/features.gni ('k') | ppapi/native_client/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698