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("//build/module_args/mojo.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 |
| 14 group("shell") { | 15 group("shell") { |
| 15 testonly = true | 16 testonly = true |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 299 mojo_shell_test_assets_dir = "$root_build_dir/mojo_shell_test_assets" | 300 mojo_shell_test_assets_dir = "$root_build_dir/mojo_shell_test_assets" |
| 300 | 301 |
| 301 copy_ex("copy_mojo_shell_assets") { | 302 copy_ex("copy_mojo_shell_assets") { |
| 302 clear_dir = true | 303 clear_dir = true |
| 303 dest = mojo_shell_assets_dir | 304 dest = mojo_shell_assets_dir |
| 304 sources = [ | 305 sources = [ |
| 305 "$root_out_dir/lib.stripped/libbootstrap.so", | 306 "$root_out_dir/lib.stripped/libbootstrap.so", |
| 306 "$root_out_dir/network_service.mojo", | 307 "$root_out_dir/network_service.mojo", |
| 307 "$root_out_dir/obj/shell/bootstrap_java.dex.jar", | 308 "$root_out_dir/obj/shell/bootstrap_java.dex.jar", |
| 308 ] | 309 ] |
| 310 if (use_prebuilt_network_service) { | |
|
ppi
2015/02/10 16:49:50
Is this needed? I'd think that putting "$root_out_
jamesr
2015/02/10 22:45:21
This shouldn't be conditional other than as a tran
blundell
2015/02/11 21:06:17
Done.
| |
| 311 deps = [ | |
| 312 "//mojo/public/tools:copy_network_service", | |
| 313 ] | |
| 314 } | |
| 309 } | 315 } |
| 310 | 316 |
| 311 copy("copy_mojo_shell") { | 317 copy("copy_mojo_shell") { |
| 312 sources = [ | 318 sources = [ |
| 313 "$root_out_dir/exe.stripped/mojo_shell", | 319 "$root_out_dir/exe.stripped/mojo_shell", |
| 314 ] | 320 ] |
| 315 outputs = [ | 321 outputs = [ |
| 316 "$root_out_dir/lib.stripped/libmojo_shell.so", | 322 "$root_out_dir/lib.stripped/libmojo_shell.so", |
| 317 ] | 323 ] |
| 318 } | 324 } |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 498 | 504 |
| 499 deps -= [ | 505 deps -= [ |
| 500 ":lib", | 506 ":lib", |
| 501 ":external_application_registrar_connection", | 507 ":external_application_registrar_connection", |
| 502 ":external_application_registrar_bindings", | 508 ":external_application_registrar_bindings", |
| 503 "//shell/domain_socket", | 509 "//shell/domain_socket", |
| 504 "//shell/domain_socket:tests", | 510 "//shell/domain_socket:tests", |
| 505 ] | 511 ] |
| 506 } | 512 } |
| 507 } | 513 } |
| OLD | NEW |