Revert of Build Mojo apps in subdirectories, like application packages.

mojo/runner/BUILD.gn

 # 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/generate_mojo_shell_assets_list.gni")
 import("//mojo/public/mojo_application.gni")
 import("//testing/test.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # We don't support building in the component build since mojo apps are
@@ skipping 271 matching lines @@
     clear_dir = true
     dest = mojo_runner_assets_dir
     deps = [
       ":bootstrap",
       ":bootstrap_java",
       ":copy_mojo_runner",
       "//mojo/services/network",
     ]
     sources = [
       "$root_out_dir/lib.stripped/libbootstrap.so",
+      "$root_out_dir/network_service.mojo",
       "$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar",
     ]
-
-    # Directories can't be specified as sources so pass manually to the script.
-    args = [ "--files=" +
-             rebase_path("$root_out_dir/network_service", root_build_dir) ]
   }
 
   generate_mojo_shell_assets_list("build_mojo_runner_assets") {
     deps = [
       ":copy_mojo_runner_assets",
     ]
     dir = mojo_runner_assets_dir
   }
 
   copy("copy_mojo_runner") {
     sources = [
       "$root_out_dir/exe.stripped/mojo_runner",
     ]
     outputs = [
       "$root_out_dir/lib.stripped/libmojo_runner.so",
     ]
     deps = [
       ":mojo_runner",
     ]
   }
 
   copy_ex("copy_mojo_runner_test_assets") {
     clear_dir = true
     dest = mojo_runner_test_assets_dir
+    sources = [
+      "$root_out_dir/test_app.mojo",
+      "$root_out_dir/test_request_tracker_app.mojo",
+    ]
     deps = [
       "//mojo/services/test_service:test_app",
       "//mojo/services/test_service:test_request_tracker_app",
     ]
-
-    # Directories can't be specified as sources so pass manually to the script.
-    args = [
-      "--files=" + rebase_path("$root_out_dir/test_app", root_build_dir),
-      "--files=" +
-          rebase_path("$root_out_dir/test_request_tracker_app", root_build_dir),
-    ]
   }
 
   android_apk("mojo_runner_apk") {
     apk_name = "MojoRunner"
 
     android_manifest = "android/apk/AndroidManifest.xml"
 
     native_libs = [ "libmojo_runner.so" ]
 
     asset_location = mojo_runner_assets_dir
@@ skipping 101 matching lines @@
   ]
 
   deps = [
     "//base",
     "//mojo/application/public/cpp:test_support",
     "//mojo/runner/test:bindings",
     "//mojo/services/network/public/interfaces",
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
   ]
 }