Chromium Code Reviews| Index: shell/BUILD.gn |
| diff --git a/shell/BUILD.gn b/shell/BUILD.gn |
| index 3f4838a69c0d969768b0be77038b08bb4ece83f6..eef339b52c7cae676dde323c2105e61a1c7fef25 100644 |
| --- a/shell/BUILD.gn |
| +++ b/shell/BUILD.gn |
| @@ -3,6 +3,7 @@ |
| # found in the LICENSE file. |
| import("//build/config/ui.gni") |
| +import("//mojo/nacl/config.gni") |
| import("//mojo/public/mojo.gni") |
| import("//mojo/public/tools/bindings/mojom.gni") |
| import("//testing/test.gni") |
| @@ -11,6 +12,14 @@ import("//testing/test.gni") |
| # inherently components. |
| assert(!is_component_build) |
| +config("gate_nacl") { |
|
jamesr
2015/02/03 05:15:41
it's not worth adding a new config that will be us
Nick Bray (chromium)
2015/02/03 19:06:31
Done.
|
| + if (mojo_use_nacl) { |
| + defines = [ "MOJO_USE_NACL=1" ] |
| + } else { |
| + defines = [ "MOJO_USE_NACL=0" ] |
| + } |
| +} |
| + |
| group("shell") { |
| testonly = true |
| @@ -191,6 +200,18 @@ source_set("lib") { |
| "//url", |
| ] |
| + configs += [ ":gate_nacl" ] |
| + if (mojo_use_nacl) { |
| + sources += [ |
|
jamesr
2015/02/03 05:15:41
as in defines += [ .. ] in here (and if you must h
Nick Bray (chromium)
2015/02/03 19:06:31
Done, although I generally believe using -Wundef i
|
| + "nacl/nacl_service_runner.cc", |
| + "nacl/nacl_service_runner.h", |
| + ] |
| + |
| + deps += [ "//mojo/nacl:monacl_sel" ] |
| + |
| + data_deps = [ "//mojo/nacl:irt_mojo(//native_client/build/toolchain/nacl:irt_${cpu_arch})" ] |
| + } |
| + |
| if (is_win) { |
| deps -= [ "//shell/domain_socket" ] |
| } |