Upload/Download dart_snapshotter

mojo/public/dart/rules.gni

Index: mojo/public/dart/rules.gni
diff --git a/mojo/public/dart/rules.gni b/mojo/public/dart/rules.gni
index f02904109ed821f551f33aabbbcf58af3fa179fb..f17d3ae7e406ec2c53f868a5f9fd391b84cb6322 100644
--- a/mojo/public/dart/rules.gni
+++ b/mojo/public/dart/rules.gni
@@ -9,6 +9,7 @@
 # - dartzip_package
 # - dartzip_packaged_application
 
+import("../mojo.gni")
 import("//build/module_args/mojo.gni")
 import("//build/module_args/dart.gni")
 
@@ -16,11 +17,18 @@ template("dartx") {
   bundle_prefix = target_name
   bundle = "$target_gen_dir/${bundle_prefix}.dartx"
   snapshot = "$target_gen_dir/${bundle_prefix}_snapshot.bin"
-  dart_snapshotter = "$root_out_dir/dart_snapshotter"
-  if (current_toolchain != host_toolchain) {
-    toolchain_name = get_label_info(host_toolchain, "name")
-    dart_snapshotter = "$root_out_dir/$toolchain_name/dart_snapshotter"
+
+  if (mojo_use_prebuilt_dart_snapshotter) {
+    dart_snapshotter_rule =
+        rebase_path("mojo/public/tools:copy_dart_snapshotter", ".", mojo_root)
+  } else {
+    dart_snapshotter_rule =
+        rebase_path("mojo/dart/dart_snapshotter", ".", mojo_root)

[jamesr, 2015/08/17 20:59:51]

the sdk should not depend on paths outside the sdk. if you want to allow
specifying a label in the host environment (i.e. the mojo checkout) make that an
optional parameter in //build/module_args/

[zra, 2015/08/17 21:59:18]

Used the variable you added.

   }
+  data_deps = [ "$dart_snapshotter_rule($host_toolchain)" ]

[jamesr, 2015/08/17 20:59:51]

data_deps is wrong since you need this to exist before you can start running the
action. use deps

[zra, 2015/08/17 21:59:18]

Fixed after your change.

+  dart_snapshotter_dir =
+      get_label_info("$dart_snapshotter_rule($host_toolchain)", "root_out_dir")
+  dart_snapshotter = "$dart_snapshotter_dir/dart_snapshotter"
 
   action("gen_${bundle_prefix}_snapshot") {
     main_dart = invoker.main_dart