Use a static catalog manifest for the standalone Mash runner

services/service_manager/standalone/BUILD.gn

Index: services/service_manager/standalone/BUILD.gn
diff --git a/services/service_manager/standalone/BUILD.gn b/services/service_manager/standalone/BUILD.gn
index cf01f75c4ced21bd1c0c86cede068a1e8e16a7b3..63d18d8cea5653c3283114e0e6166fe6b469f1a2 100644
--- a/services/service_manager/standalone/BUILD.gn
+++ b/services/service_manager/standalone/BUILD.gn
@@ -6,39 +6,25 @@ import("//services/service_manager/public/cpp/service.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
-executable("standalone") {
-  output_name = "mojo_runner"
+source_set("standalone") {
   sources = [
-    "desktop/main.cc",
-  ]
-  deps = [
-    ":lib",
-    "//base",
-    "//build/config/sanitizers:deps",
-    "//build/win:default_exe_manifest",
-  ]
-}
-
-source_set("lib") {
-  sources = [
-    "desktop/launcher_process.cc",
-    "desktop/launcher_process.h",
-    "desktop/main_helper.cc",
-    "desktop/main_helper.h",
+    "context.cc",
+    "context.h",
     "tracer.cc",
     "tracer.h",
   ]
 
   deps = [
     "//base",
-    "//base:base_static",
     "//base/third_party/dynamic_annotations",
     "//components/tracing:startup_tracing",
+    "//mojo/common:common_base",
     "//mojo/edk/system",
     "//services/catalog:lib",
     "//services/service_manager",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp/standalone_service",
+    "//services/service_manager/runner/common",
     "//services/service_manager/runner/host:lib",
     "//services/tracing/public/cpp",
     "//services/tracing/public/interfaces",
@@ -48,19 +34,4 @@ source_set("lib") {
   data_deps = [
     "//services/tracing",
   ]
-
-  if (!is_ios) {
-    sources += [
-      "context.cc",
-      "context.h",
-    ]
-  }
-
-  # This target includes some files behind #ifdef OS... guards. Since gn is not
-  # smart enough to understand preprocess includes, it does complains about
-  # these includes when not using the build files for that OS. Suppress checking
-  # so we can enable checking for the rest of the targets in this file.
-  # TODO: Might be better to split the files with OS-specific includes out to a
-  # separate source_set so we can leave checking on for the rest of the target.
-  check_includes = false
 }