Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2

mojo/public/mojo_application.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/mojo.gni")
+import("mojo.gni")
+import("mojo_sdk.gni")
 
 # Generate a binary mojo application.The parameters of this template are those
 # of a shared library.
 template("mojo_native_application") {
   if (defined(invoker.output_name)) {
     output = invoker.output_name + ".mojo"
     library_target_name = invoker.output_name + "_library"
   } else {
     output = target_name + ".mojo"
     library_target_name = target_name + "_library"
@@ skipping 35 matching lines @@
     }
     if (defined(invoker.ldflags)) {
       ldflags = invoker.ldflags
     }
     if (defined(invoker.lib_dirs)) {
       lib_dirs = invoker.lib_dirs
     }
     if (defined(invoker.libs)) {
       libs = invoker.libs
     }
+
+    if (use_prebuilt_mojo_shell) {
+      copy_mojo_shell =
+        rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root)
+    }
+
     # Copy the prebuilt mojo_shell if using it.
     if (defined(invoker.datadeps)) {
       datadeps = invoker.datadeps
       if (use_prebuilt_mojo_shell) {
-        datadeps += [ "//mojo/public/tools:copy_mojo_shell" ]
+        datadeps += [ copy_mojo_shell ]
       }
     } else {
       if (use_prebuilt_mojo_shell) {
-        datadeps = [ "//mojo/public/tools:copy_mojo_shell" ]
+        datadeps = [ copy_mojo_shell ]
       }
     }
+    deps = rebase_path([
+      "mojo/public/c/system:for_shared_library",
+    ], ".", mojo_root)
     if (defined(invoker.deps)) {
-      deps = invoker.deps
+      deps += invoker.deps
     }
     if (defined(invoker.forward_dependent_configs_from)) {
       forward_dependent_configs_from = invoker.forward_dependent_configs_from
     }
     if (defined(invoker.public_deps)) {
       public_deps = invoker.public_deps
     }
     if (defined(invoker.all_dependent_configs)) {
       all_dependent_configs = invoker.all_dependent_configs
     }
@@ skipping 75 matching lines @@
       ]
     }
 
     if (defined(invoker.output_name)) {
       mojo_output = "$target_out_dir/" + invoker.output_name + ".mojo"
     } else {
       mojo_output = "$target_out_dir/" + target_name + ".mojo"
     }
 
     action(target_name) {
-      script = "//mojo/public/tools/prepend.py"
+      script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root)
 
       input = zip_action_output
       inputs = [ input ]
 
       output = mojo_output
       outputs = [ output ]
 
       rebase_input = rebase_path(input, root_build_dir)
       rebase_output = rebase_path(output, root_build_dir)
       args = [
         "--input=$rebase_input",
         "--output=$rebase_output",
         "--line=#!mojo:android_handler",
       ]
     }
   }
 }