Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1923)

Unified Diff: mojo/shell/BUILD.gn

Issue 694413003: Add mojo_launcher (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Minor cleanup Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/application_manager/application_manager.cc ('k') | mojo/shell/incoming_connection_listener_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index 651e39bd9651aa917300bcd73fa1bbe22a6000c0..87499963858c2e92e75fe6f305a06c272e5f7746 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -13,7 +13,6 @@ if (is_android) {
if (!use_prebuilt_mojo_shell) {
-# GYP version: mojo/mojo.gyp:mojo_shell
executable("mojo_shell") {
sources = [
"desktop/mojo_main.cc"
@@ -26,15 +25,39 @@ executable("mojo_shell") {
"//mojo/common",
"//mojo/environment:chromium",
]
-
- if (is_component_build) {
- deps += ["//ui/gl"]
- }
}
} # !use_prebuilt_mojo_shell
-# GYP version: mojo/mojo.gyp:mojo_shell_lib
+executable("mojo_launcher") {
+ sources = [
+ "launcher_main.cc"
+ ]
+
+ deps = [
+ ":external_application_registrar_bindings",
+ ":external_application_registrar_connection",
+ ":in_process_dynamic_service_runner",
+ "//base",
+ "//mojo/common",
+ "//mojo/edk/system",
+ "//mojo/environment:chromium",
+ ]
+}
+
+source_set("in_process_dynamic_service_runner") {
+ sources = [
+ "dynamic_service_runner.cc",
+ "dynamic_service_runner.h",
+ "in_process_dynamic_service_runner.cc",
+ "in_process_dynamic_service_runner.h",
+ ]
+
+ deps = [
+ "//mojo/gles2",
Chris Masone 2014/11/04 01:35:34 Is this going to remain necessary always, or could
+ ]
+}
+
source_set("lib") {
sources = [
"app_child_process.cc",
@@ -49,15 +72,11 @@ source_set("lib") {
"context.h",
"dynamic_application_loader.cc",
"dynamic_application_loader.h",
- "dynamic_service_runner.cc",
- "dynamic_service_runner.h",
"external_application_listener.h",
"external_application_listener_posix.cc",
"external_application_listener_win.cc",
"filename_util.cc",
"filename_util.h",
- "in_process_dynamic_service_runner.cc",
- "in_process_dynamic_service_runner.h",
"incoming_connection_listener_posix.cc",
"incoming_connection_listener_posix.h",
"init.cc",
@@ -80,6 +99,7 @@ source_set("lib") {
":app_child_process_bindings",
":external_application_registrar_bindings",
":external_service_bindings",
+ ":in_process_dynamic_service_runner",
"//base",
"//base/third_party/dynamic_annotations",
"//base:base_static",
@@ -87,7 +107,6 @@ source_set("lib") {
"//mojo/application_manager",
"//mojo/common",
"//mojo/edk/system",
- "//mojo/gles2",
"//mojo/public/interfaces/application",
"//mojo/services/public/interfaces/network",
"//mojo/shell/domain_socket",
« no previous file with comments | « mojo/application_manager/application_manager.cc ('k') | mojo/shell/incoming_connection_listener_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698