Cleanup GN BUILD files, gni's and imports.

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("//build/module_args/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)) {
     base_target_name = invoker.output_name
   } else {
     base_target_name = target_name
   }
 
@@ skipping 270 matching lines @@
   }
 }
 
 if (is_android) {
   # Declares an Android Mojo application consisting of an .so file and a
   # corresponding .dex.jar file.
   #
   # Variables:
   #   input_so: the .so file to bundle
   #   input_dex_jar: the .dex.jar file to bundle
+  #   deps / public_deps / data_deps (optional):
+  #       Dependencies. The targets that generate the .so/jar inputs should be
+  #       listed in either deps or public_deps.
   #   output_name (optional): override for the output file name
   template("mojo_android_application") {
     assert(defined(invoker.input_so))
     assert(defined(invoker.input_dex_jar))
 
     zip_action_name = "${target_name}_zip"
     zip_action_output = "$target_gen_dir/${target_name}.zip"
+    prepend_action_name = target_name
     action(zip_action_name) {
+      visibility = [ ":$prepend_action_name" ]
       script = "//build/android/gn/zip.py"
 
       inputs = [
         invoker.input_so,
         invoker.input_dex_jar,
       ]
 
       output = zip_action_output
       outputs = [
         output,
       ]
 
       rebase_inputs = rebase_path(inputs, root_build_dir)
       rebase_output = rebase_path(output, root_build_dir)
       args = [
         "--inputs=$rebase_inputs",
         "--output=$rebase_output",
       ]
+
+      if (defined(invoker.deps)) {
+        deps = invoker.deps
+      }
+      if (defined(invoker.public_deps)) {
+        public_deps = invoker.public_deps
+      }
+      if (defined(invoker.data_deps)) {
+        data_deps = invoker.data_deps
+      }
     }
 
     if (defined(invoker.output_name)) {
       mojo_output = "$root_out_dir/" + invoker.output_name + ".mojo"
     } else {
       mojo_output = "$root_out_dir/" + target_name + ".mojo"
     }
 
     action(target_name) {
       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 mojo:android_handler",
       ]
+
+      public_deps = [
+        ":$zip_action_name",
+      ]
     }
   }
 }