Simplify //mojo/public/c/system targets

mojo/public/mojo_application.gni

Index: mojo/public/mojo_application.gni
diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni
index d28cb440aaa98fd709f101c697539f6c6d392cd2..4145d5bf6c03dc9800f75ab7421ceb510a47776b 100644
--- a/mojo/public/mojo_application.gni
+++ b/mojo/public/mojo_application.gni
@@ -62,7 +62,7 @@ template("mojo_native_application") {
 
     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.
@@ -73,12 +73,17 @@ template("mojo_native_application") {
       }
     } 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
     }
@@ -116,9 +121,7 @@ template("mojo_native_application") {
       testonly = invoker.testonly
     }
 
-    visibility = [
-      ":${final_target_name}",
-    ]
+    visibility = [ ":${final_target_name}" ]
   }
 
   copy(final_target_name) {
@@ -131,8 +134,12 @@ template("mojo_native_application") {
     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}",
+    ]
   }
 }
 
@@ -159,7 +166,9 @@ if (is_android) {
       ]
 
       output = zip_action_output
-      outputs = [ output ]
+      outputs = [
+        output,
+      ]
 
       rebase_inputs = rebase_path(inputs, root_build_dir)
       rebase_output = rebase_path(output, root_build_dir)
@@ -179,10 +188,14 @@ if (is_android) {
       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)