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

Unified Diff: shell/BUILD.gn

Issue 814273005: Move application_manager from /mojo to /shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Update include guards. Created 5 years, 11 months 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_loader.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/shell/BUILD.gn b/shell/BUILD.gn
index d1bba63b2754c483cc4dd5782f59b7fbf84bfba7..63fcde447c7227fca1afbab13b540e9baf772c5d 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -35,6 +35,7 @@ group("tests") {
deps = [
":external_application_unittests",
":mojo_shell_tests",
+ "//shell/application_manager:mojo_application_manager_unittests",
]
}
@@ -71,8 +72,8 @@ if (!use_prebuilt_mojo_shell) {
deps += [
":jni_headers",
- "//mojo/application_manager:application_manager",
"//services/native_viewport:lib",
+ "//shell/application_manager",
"//ui/gl",
]
}
@@ -178,13 +179,13 @@ source_set("lib") {
"//base/third_party/dynamic_annotations",
"//base:base_static",
"//mojo/application",
- "//mojo/application_manager",
"//mojo/common",
"//mojo/common:tracing_impl",
"//mojo/edk/system",
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/application",
"//mojo/services/network/public/interfaces",
+ "//shell/application_manager",
"//shell/domain_socket",
"//services/tracing:bindings",
"//url",
@@ -424,12 +425,12 @@ test("mojo_shell_tests") {
"//testing/gtest",
"//net:test_support",
"//url",
- "//mojo/application_manager",
"//mojo/common",
"//mojo/edk/system",
"//mojo/environment:chromium",
"//mojo/public/cpp/bindings",
"//services/test_service:bindings",
+ "//shell/application_manager",
]
datadeps = [
@@ -458,8 +459,8 @@ source_set("test_support") {
":init",
":lib",
"//base",
- "//mojo/application_manager",
"//mojo/edk/system",
+ "//shell/application_manager",
]
}
@@ -479,10 +480,10 @@ test("external_application_unittests") {
"//testing/gtest",
"//url",
"//mojo/application",
- "//mojo/application_manager",
"//mojo/common",
"//mojo/edk/system",
"//mojo/environment:chromium",
+ "//shell/application_manager",
"//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_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698