Separate mojo/shell into a runner and the application manager (shell)

mojo/runner/BUILD.gn

Index: mojo/runner/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/runner/BUILD.gn
similarity index 87%
copy from mojo/shell/BUILD.gn
copy to mojo/runner/BUILD.gn
index 38b8639f7807aa1a93b8bf34dc6b96c46ac767b9..d9ddc78485ca9fae10559c60cf3768aa11e175d5 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/runner/BUILD.gn
@@ -12,18 +12,18 @@ import("//testing/test.gni")
 # inherently components.
 assert(!is_component_build)
 
-group("shell") {
+group("runner") {
   testonly = true
 
   deps = [
-    ":mojo_shell",
+    ":mojo_runner",
     ":tests",
-    "//mojo/shell/application_manager:tests",
+    "//mojo/shell:tests",
   ]
 
   if (is_android) {
     deps += [
-      ":mojo_shell_apk",
+      ":mojo_runner_apk",
       ":tests_apk",
     ]
   }
@@ -34,7 +34,7 @@ if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
-executable("mojo_shell") {
+executable("mojo_runner") {
   sources = []
 
   deps = [
@@ -65,7 +65,7 @@ executable("mojo_shell") {
     deps += [
       ":jni_headers",
       "//components/native_viewport:lib",
-      "//mojo/shell/application_manager",
+      "//mojo/shell",
       "//ui/gl",
     ]
   }
@@ -79,7 +79,7 @@ source_set("in_process_native_runner") {
 
   public_deps = [
     ":native_application_support",
-    "//mojo/shell/application_manager",
+    "//mojo/shell",
   ]
 
   deps = [
@@ -121,7 +121,7 @@ source_set("lib") {
     "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//third_party/mojo/src/mojo/public/interfaces/application",
     "//mojo/services/network/public/interfaces",
-    "//mojo/shell/application_manager",
+    "//mojo/shell",
     "//mojo/services/tracing:bindings",
     "//ui/gl",
     "//url",
@@ -261,49 +261,49 @@ if (is_android) {
     custom_package = "org.chromium.mojo.shell"
   }
 
-  mojo_shell_assets_dir = "$root_build_dir/mojo_shell_assets"
-  mojo_shell_test_assets_dir = "$root_build_dir/mojo_shell_test_assets"
+  mojo_runner_assets_dir = "$root_build_dir/mojo_runner_assets"
+  mojo_runner_test_assets_dir = "$root_build_dir/mojo_runner_test_assets"
 
-  copy_ex("copy_mojo_shell_assets") {
+  copy_ex("copy_mojo_runner_assets") {
     clear_dir = true
-    dest = mojo_shell_assets_dir
+    dest = mojo_runner_assets_dir
     sources = [
       "$root_out_dir/lib.stripped/libbootstrap.so",
       "$root_out_dir/network_service.mojo",
-      "$root_out_dir/obj/mojo/shell/bootstrap_java.dex.jar",
+      "$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar",
     ]
   }
 
-  copy("copy_mojo_shell") {
+  copy("copy_mojo_runner") {
     sources = [
-      "$root_out_dir/exe.stripped/mojo_shell",
+      "$root_out_dir/exe.stripped/mojo_runner",
     ]
     outputs = [
-      "$root_out_dir/lib.stripped/libmojo_shell.so",
+      "$root_out_dir/lib.stripped/libmojo_runner.so",
     ]
   }
 
-  copy_ex("copy_mojo_shell_test_assets") {
+  copy_ex("copy_mojo_runner_test_assets") {
     clear_dir = true
-    dest = mojo_shell_test_assets_dir
+    dest = mojo_runner_test_assets_dir
     sources = [
       "$root_out_dir/test_app.mojo",
       "$root_out_dir/test_request_tracker_app.mojo",
     ]
   }
 
-  android_apk("mojo_shell_apk") {
-    apk_name = "MojoShell"
+  android_apk("mojo_runner_apk") {
+    apk_name = "MojoRunner"
 
     android_manifest = "android/apk/AndroidManifest.xml"
 
-    native_libs = [ "libmojo_shell.so" ]
+    native_libs = [ "libmojo_runner.so" ]
 
-    asset_location = mojo_shell_assets_dir
+    asset_location = mojo_runner_assets_dir
 
     deps = [
-      ":copy_mojo_shell",
-      ":copy_mojo_shell_assets",
+      ":copy_mojo_runner",
+      ":copy_mojo_runner_assets",
       ":java",
       ":resources",
       "//base:base_java",
@@ -312,7 +312,7 @@ if (is_android) {
     ]
   }
 
-  android_library("mojo_shell_tests_java") {
+  android_library("mojo_runner_tests_java") {
     java_files =
         [ "android/tests/src/org/chromium/mojo/shell/ShellTestBase.java" ]
 
@@ -334,7 +334,7 @@ mojom("child_process_bindings") {
 }
 
 test("tests") {
-  output_name = "mojo_shell_unittests"
+  output_name = "mojo_runner_unittests"
 
   sources = [
     "child_process_host_unittest.cc",
@@ -362,7 +362,7 @@ test("tests") {
     "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/public/cpp/bindings",
     "//mojo/services/test_service:bindings",
-    "//mojo/shell/application_manager",
+    "//mojo/shell",
   ]
 
   datadeps = [
@@ -376,16 +376,16 @@ test("tests") {
     deps += [ ":jni_headers" ]
 
     apk_deps = [
-      ":copy_mojo_shell_test_assets",
-      ":mojo_shell_tests_java",
+      ":copy_mojo_runner_test_assets",
+      ":mojo_runner_tests_java",
     ]
 
-    apk_asset_location = mojo_shell_test_assets_dir
+    apk_asset_location = mojo_runner_test_assets_dir
   }
 }
 
 mojo_native_application("apptests") {
-  output_name = "shell_apptests"
+  output_name = "runner_apptests"
 
   testonly = true
 
@@ -399,14 +399,15 @@ mojo_native_application("apptests") {
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/common:common",
-    "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
-    "//third_party/mojo/src/mojo/public/cpp/environment",
-    "//third_party/mojo/src/mojo/public/cpp/system:system",
+    "//mojo/runner/test:bindings",
 
     #"//mojo/services/http_server/public/cpp",
     #"//mojo/services/http_server/public/interfaces",
     "//mojo/services/network/public/interfaces",
-    "//mojo/shell/test:bindings",
+
+    "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
+    "//third_party/mojo/src/mojo/public/cpp/environment",
+    "//third_party/mojo/src/mojo/public/cpp/system:system",
   ]
 
   #data_deps = [ "//services/http_server:http_server($default_toolchain)" ]