Chromium Code Reviews| OLD | NEW |
|---|---|
| 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("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//mojo/nacl/config.gni") | |
| 6 import("//mojo/public/mojo.gni") | 7 import("//mojo/public/mojo.gni") |
| 7 import("//mojo/public/tools/bindings/mojom.gni") | 8 import("//mojo/public/tools/bindings/mojom.gni") |
| 8 import("//testing/test.gni") | 9 import("//testing/test.gni") |
| 9 | 10 |
| 10 # We don't support building in the component build since mojo apps are | 11 # We don't support building in the component build since mojo apps are |
| 11 # inherently components. | 12 # inherently components. |
| 12 assert(!is_component_build) | 13 assert(!is_component_build) |
| 13 | 14 |
| 15 config("gate_nacl") { | |
| 16 if (mojo_use_nacl) { | |
| 17 defines = [ "MOJO_USE_NACL=1" ] | |
| 18 } else { | |
| 19 defines = [ "MOJO_USE_NACL=0" ] | |
| 20 } | |
| 21 } | |
| 22 | |
| 14 group("shell") { | 23 group("shell") { |
| 15 testonly = true | 24 testonly = true |
| 16 | 25 |
| 17 deps = [ | 26 deps = [ |
| 18 ":mojo_shell", | 27 ":mojo_shell", |
| 19 ":tests", | 28 ":tests", |
| 20 ] | 29 ] |
| 21 | 30 |
| 22 if (!is_win) { | 31 if (!is_win) { |
| 23 deps += [ ":mojo_launcher" ] | 32 deps += [ ":mojo_launcher" ] |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 184 "//mojo/edk/system", | 193 "//mojo/edk/system", |
| 185 "//mojo/public/cpp/bindings", | 194 "//mojo/public/cpp/bindings", |
| 186 "//mojo/public/interfaces/application", | 195 "//mojo/public/interfaces/application", |
| 187 "//mojo/services/network/public/interfaces", | 196 "//mojo/services/network/public/interfaces", |
| 188 "//shell/application_manager", | 197 "//shell/application_manager", |
| 189 "//shell/domain_socket", | 198 "//shell/domain_socket", |
| 190 "//services/tracing:bindings", | 199 "//services/tracing:bindings", |
| 191 "//url", | 200 "//url", |
| 192 ] | 201 ] |
| 193 | 202 |
| 203 data_deps = [] | |
|
jamesr
2015/01/29 23:41:23
you don't need to have this
Nick Bray (chromium)
2015/01/29 23:54:55
Done. Just trying to be idiot proof.
| |
| 204 | |
| 205 configs += [ ":gate_nacl" ] | |
| 206 if (mojo_use_nacl) { | |
| 207 sources += [ | |
| 208 "nacl/nacl_service_runner.cc", | |
| 209 "nacl/nacl_service_runner.h", | |
| 210 ] | |
| 211 | |
| 212 deps += [ "//mojo/nacl:monacl_sel" ] | |
| 213 | |
| 214 data_deps += [ "//native_client/src/untrusted/irt:irt_core(//native_client/b uild/toolchain/nacl:irt_${cpu_arch})" ] | |
|
jamesr
2015/01/29 23:41:23
and you can just say data_deps = [] here
Nick Bray (chromium)
2015/01/29 23:54:55
Done.
| |
| 215 } | |
| 216 | |
| 194 if (is_win) { | 217 if (is_win) { |
| 195 deps -= [ "//shell/domain_socket" ] | 218 deps -= [ "//shell/domain_socket" ] |
| 196 } | 219 } |
| 197 | 220 |
| 198 if (is_android) { | 221 if (is_android) { |
| 199 sources += [ | 222 sources += [ |
| 200 "android/android_handler.cc", | 223 "android/android_handler.cc", |
| 201 "android/android_handler.h", | 224 "android/android_handler.h", |
| 202 "android/android_handler_loader.cc", | 225 "android/android_handler_loader.cc", |
| 203 "android/android_handler_loader.h", | 226 "android/android_handler_loader.h", |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 498 | 521 |
| 499 deps -= [ | 522 deps -= [ |
| 500 ":lib", | 523 ":lib", |
| 501 ":external_application_registrar_connection", | 524 ":external_application_registrar_connection", |
| 502 ":external_application_registrar_bindings", | 525 ":external_application_registrar_bindings", |
| 503 "//shell/domain_socket", | 526 "//shell/domain_socket", |
| 504 "//shell/domain_socket:tests", | 527 "//shell/domain_socket:tests", |
| 505 ] | 528 ] |
| 506 } | 529 } |
| 507 } | 530 } |
| OLD | NEW |