Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/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/public/mojo_application.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
-group("runner") {
-  testonly = true
-
-  deps = [
-    ":mojo_runner",
-  ]
-}
-
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 source_set("register_local_aliases_fwd") {
   sources = [
     "register_local_aliases.h",
   ]
 }
 
-source_set("mojo_runner_lib") {
+# main() entrypoint definition is structured into a static lib for Android's
+# benefit, as it is shared between the standalone executable and other
+# executables (e.g. Mandoline).
+source_set("main_lib") {
   sources = []
 
   deps = [
     ":lib",
     "//base",
     "//build/config/sanitizers:deps",
     "//mojo/common",
     "//mojo/environment:chromium",
     "//mojo/message_pump",
     "//mojo/shell/runner/host:lib",
@@ skipping 22 matching lines @@
       ":jni_headers",
       "//components/mus",
       "//components/mus/ws:lib",
       "//mojo/shell",
       "//ui/gl",
       "//ui/platform_window/android",
     ]
   }
 }
 
-executable("mojo_runner") {
+executable("standalone") {
+  output_name = "mojo_runner"
   deps = [
-    ":mojo_runner_lib",
+    ":main_lib",
     "//build/config/sanitizers:deps",
   ]
 
   if (is_android) {
     sources = [
       "android/context_init.cc",
       "register_local_aliases.cc",
     ]
 
     deps += [
@@ skipping 168 matching lines @@
     resource_dirs = [ "android/apk/res" ]
     custom_package = "org.chromium.mojo.shell"
   }
 
   android_assets("android_assets") {
     deps = [
       ":bootstrap",
       ":bootstrap_java",
     ]
     sources = [
-      "$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar",
+      "$root_out_dir/obj/mojo/shell/standalone/bootstrap_java.dex.jar",
       "$root_shlib_dir/${shlib_prefix}bootstrap$shlib_extension",
     ]
   }
 
-  android_assets("mojo_runner_apptests_assets") {
+  android_assets("mojo_shell_standalone_apptests_assets") {
     testonly = true
     deps = [
       ":android_assets",
       "//components/clipboard:apptests_assets",
       "//components/clipboard:clipboard_assets",
       "//components/mus/ws:apptests_assets",
       "//components/resource_provider:apptests_assets",
       "//components/resource_provider:resource_provider_assets",
       "//mojo/services/network:apptests_assets",
       "//mojo/services/network:network_assets",
       "//third_party/icu:icu_assets",
     ]
   }
 
-  copy("copy_mojo_runner") {
+  copy("copy_mojo_shell_standalone") {
     sources = [
       "$root_out_dir/mojo_runner",
     ]
     outputs = [
       "$root_shlib_dir/${shlib_prefix}mojo_runner$shlib_extension",
     ]
     deps = [
-      ":mojo_runner",
+      ":standalone",
     ]
   }
 
-  android_apk("mojo_runner_apptests_apk") {
+  android_apk("mojo_shell_standalone_apptests_apk") {
     testonly = true
     apk_name = "MojoRunnerApptests"
     android_manifest = "android/apk/AndroidManifest.xml"
     native_libs = [ "${shlib_prefix}mojo_runner$shlib_extension" ]
     write_asset_list = true
 
     deps = [
-      ":copy_mojo_runner",
+      ":copy_mojo_shell_standalone",
       ":java",
-      ":mojo_runner_apptests_assets",
+      ":mojo_shell_standalone_apptests_assets",
       ":resources",
       "//base:base_java",
       "//ui/platform_window/android:platform_window_java",
       google_play_services_resources,
     ]
   }
 }