Simplify //mojo/public/c/system targets

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.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") {
@@ skipping 44 matching lines @@
     }
     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)
+          rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root)

[viettrungluu, 2014/12/08 23:16:34]

I assume most of this is just gn format churn?

[jamesr, 2014/12/09 01:20:32]

Yes

     }
 
     # Copy the prebuilt mojo_shell if using it.
     if (defined(invoker.datadeps)) {
       datadeps = invoker.datadeps
       if (use_prebuilt_mojo_shell) {
         datadeps += [ copy_mojo_shell ]
       }
     } else {
       if (use_prebuilt_mojo_shell) {
-        datadeps = [ copy_mojo_shell ]
+        datadeps = [
+          copy_mojo_shell,
+        ]
       }
     }
     deps = rebase_path([
-      "mojo/public/c/system:for_shared_library",
-    ], ".", mojo_root)
+                         "mojo/public/c/system",
+                         "mojo/public/platform/native:system",

[jamesr, 2014/12/09 01:20:32]

this is the only real change

+                       ],
+                       ".",
+                       mojo_root)
     if (defined(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)) {
@@ skipping 17 matching lines @@
     if (defined(invoker.public)) {
       public = invoker.public
     }
     if (defined(invoker.sources)) {
       sources = invoker.sources
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
 
-    visibility = [
-      ":${final_target_name}",
-    ]
+    visibility = [ ":${final_target_name}" ]
   }
 
   copy(final_target_name) {
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     deps = [
       ":${library_target_name}",
     ]
-    sources = [ "${root_out_dir}/${library_name}" ]
-    outputs = [ "${root_out_dir}/${output}" ]
+    sources = [
+      "${root_out_dir}/${library_name}",
+    ]
+    outputs = [
+      "${root_out_dir}/${output}",
+    ]
   }
 }
 
 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
   #   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"
     action(zip_action_name) {
       script = "//build/android/gn/zip.py"
 
       inputs = [
         invoker.input_so,
         invoker.input_dex_jar,
       ]
 
       output = zip_action_output
-      outputs = [ 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.output_name)) {
       mojo_output = "$target_out_dir/" + invoker.output_name + ".mojo"
     } else {
       mojo_output = "$target_out_dir/" + target_name + ".mojo"
     }
 
     action(target_name) {
       script = rebase_path("mojo/public/tools/prepend.py", ".", mojo_root)
 
       input = zip_action_output
-      inputs = [ input ]
+      inputs = [
+        input,
+      ]
 
       output = mojo_output
-      outputs = [ 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",
       ]
     }
   }
 }