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/module_args/mojo.gni") | 5 import("//build/module_args/mojo.gni") |
| 6 import("../mojo.gni") | 6 import("../mojo.gni") |
| 7 | 7 |
| 8 if (mojo_use_prebuilt_mojo_shell) { | 8 if (mojo_use_prebuilt_mojo_shell) { |
| 9 copy("copy_mojo_shell") { | 9 copy("copy_mojo_shell") { |
| 10 filename = "mojo_shell" | 10 filename = "mojo_shell" |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 sources = [ | 21 sources = [ |
| 22 "prebuilt/shell/linux-x64/$filename", | 22 "prebuilt/shell/linux-x64/$filename", |
| 23 ] | 23 ] |
| 24 outputs = [ | 24 outputs = [ |
| 25 "$root_out_dir/$filename", | 25 "$root_out_dir/$filename", |
| 26 ] | 26 ] |
| 27 } | 27 } |
| 28 } | 28 } |
| 29 } | 29 } |
| 30 | 30 |
| 31 if (mojo_use_prebuilt_dart_snapshotter) { | |
| 32 copy("copy_dart_snapshotter") { | |
| 33 sources = [ | |
| 34 "prebuilt/dart_snapshotter/linux-x64/dart_snapshotter", | |
|
jamesr
2015/08/14 22:55:02
this doesn't look like the right binary to use whe
zra
2015/08/17 15:06:16
I didn't see a Mac builder for Mojo. Is there one?
jamesr
2015/08/17 17:29:39
There is not, but developing from a Mac host is su
zra
2015/08/17 21:59:18
I've modified here and the upload_binaries.py scri
| |
| 35 ] | |
| 36 if (is_android) { | |
|
jamesr
2015/08/14 22:55:01
do you want to test for "is_android" here or "am i
zra
2015/08/17 15:06:16
Right now in this CL, the snapshotter is invoked d
jamesr
2015/08/17 17:29:39
I think at a minimum you shouldn't need to invoke
zra
2015/08/17 21:59:18
Done.
| |
| 37 toolchain_name = get_label_info(host_toolchain, "name") | |
| 38 outputs = [ | |
| 39 "$root_out_dir/$toolchain_name/dart_snapshotter", | |
|
jamesr
2015/08/14 22:55:01
hm, doesn't root_out_dir already contain the curre
zra
2015/08/17 15:06:16
If the current toolchain is the target toolchain,
| |
| 40 ] | |
| 41 } else { | |
| 42 assert(is_linux) | |
| 43 outputs = [ | |
| 44 "$root_out_dir/dart_snapshotter", | |
| 45 ] | |
| 46 } | |
| 47 } | |
| 48 } | |
| 49 | |
| 31 if (mojo_use_prebuilt_network_service) { | 50 if (mojo_use_prebuilt_network_service) { |
| 32 copy("copy_network_service") { | 51 copy("copy_network_service") { |
| 33 filename = "network_service.mojo" | 52 filename = "network_service.mojo" |
| 34 if (defined(mojo_prebuilt_network_service_location) && | 53 if (defined(mojo_prebuilt_network_service_location) && |
| 35 mojo_prebuilt_network_service_location != "") { | 54 mojo_prebuilt_network_service_location != "") { |
| 36 sources = [ | 55 sources = [ |
| 37 "$mojo_prebuilt_network_service_location", | 56 "$mojo_prebuilt_network_service_location", |
| 38 ] | 57 ] |
| 39 } else { | 58 } else { |
| 40 if (is_android) { | 59 if (is_android) { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 if (mojo_use_dart_apptest_framework) { | 110 if (mojo_use_dart_apptest_framework) { |
| 92 copy("dart_apptest_framework") { | 111 copy("dart_apptest_framework") { |
| 93 sources = [ | 112 sources = [ |
| 94 "prebuilt/frameworks/apptest.dartzip", | 113 "prebuilt/frameworks/apptest.dartzip", |
| 95 ] | 114 ] |
| 96 outputs = [ | 115 outputs = [ |
| 97 "$target_out_dir/dart_apptest_framework.dartzip", | 116 "$target_out_dir/dart_apptest_framework.dartzip", |
| 98 ] | 117 ] |
| 99 } | 118 } |
| 100 } | 119 } |
| OLD | NEW |