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

Unified Diff: shell/BUILD.gn

Issue 775343004: Move //mojo/shell to //shell (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « services/window_manager/window_manager_api_unittest.cc ('k') | shell/android/android_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/shell/BUILD.gn
similarity index 95%
rename from mojo/shell/BUILD.gn
rename to shell/BUILD.gn
index d9f797c806268dfa814ae1f12f76a5e13dc2900e..405b423cbd2031b26fa28db45339cfb5e12c91a8 100644
--- a/mojo/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -10,6 +10,27 @@ import("//mojo/public/tools/bindings/mojom.gni")
# inherently components.
assert(!is_component_build)
+group("shell") {
+ testonly = true
+
+ deps = [
+ ":mojo_shell",
+ ":tests",
+ ]
+
+ if (!is_win) {
+ deps += [ ":mojo_launcher" ]
+ }
+}
+
+group("tests") {
+ testonly = true
+ deps = [
+ ":external_application_unittests",
+ ":mojo_shell_tests",
+ ]
+}
+
if (is_android) {
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
@@ -138,14 +159,14 @@ source_set("lib") {
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/application",
"//mojo/services/public/interfaces/network",
- "//mojo/shell/domain_socket",
+ "//shell/domain_socket",
"//mojo/spy",
"//services/tracing:bindings",
"//url",
]
if (is_win) {
- deps -= [ "//mojo/shell/domain_socket" ]
+ deps -= [ "//shell/domain_socket" ]
}
if (is_android) {
@@ -312,12 +333,12 @@ source_set("external_application_registrar_connection") {
"//mojo/edk/system",
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/application",
- "//mojo/shell/domain_socket",
+ "//shell/domain_socket",
"//url",
]
if (is_win) {
- deps -= [ "//mojo/shell/domain_socket" ]
+ deps -= [ "//shell/domain_socket" ]
}
}
@@ -401,8 +422,8 @@ test("external_application_unittests") {
"//mojo/common",
"//mojo/edk/system",
"//mojo/environment:chromium",
- "//mojo/shell/domain_socket",
- "//mojo/shell/domain_socket:tests",
+ "//shell/domain_socket",
+ "//shell/domain_socket:tests",
]
if (is_win) {
@@ -415,8 +436,8 @@ test("external_application_unittests") {
":lib",
":external_application_registrar_connection",
":external_application_registrar_bindings",
- "//mojo/shell/domain_socket",
- "//mojo/shell/domain_socket:tests",
+ "//shell/domain_socket",
+ "//shell/domain_socket:tests",
]
}
}
« no previous file with comments | « services/window_manager/window_manager_api_unittest.cc ('k') | shell/android/android_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698