Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/BUILD.gn

Index: mojo/shell/standalone/BUILD.gn
diff --git a/mojo/runner/BUILD.gn b/mojo/shell/standalone/BUILD.gn
similarity index 92%
rename from mojo/runner/BUILD.gn
rename to mojo/shell/standalone/BUILD.gn
index 265e441cd8358ab5b2ac1c898795628d1a17ea4f..a84b72125570fe3ecc50e9501b33215543718b61 100644
--- a/mojo/runner/BUILD.gn
+++ b/mojo/shell/standalone/BUILD.gn
@@ -6,14 +6,6 @@ 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")
@@ -25,7 +17,10 @@ source_set("register_local_aliases_fwd") {
   ]
 }
 
-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 = [
@@ -68,9 +63,10 @@ source_set("mojo_runner_lib") {
   }
 }
 
-executable("mojo_runner") {
+executable("standalone") {
+  output_name = "mojo_runner"
   deps = [
-    ":mojo_runner_lib",
+    ":main_lib",
     "//build/config/sanitizers:deps",
   ]
 
@@ -259,12 +255,12 @@ if (is_android) {
       ":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",
@@ -279,7 +275,7 @@ if (is_android) {
     ]
   }
 
-  copy("copy_mojo_runner") {
+  copy("copy_mojo_shell_standalone") {
     sources = [
       "$root_out_dir/mojo_runner",
     ]
@@ -287,11 +283,11 @@ if (is_android) {
       "$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"
@@ -299,9 +295,9 @@ if (is_android) {
     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",