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

Unified Diff: shell/BUILD.gn

Issue 1509323002: Mojom updates for Motown. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: sync Created 4 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/media/common/media_pipe_base.cc ('k') | no next file » | 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 54d013fb00f1d1c65b45736fddb05f4918e62370..135930736c1bcb648b1401bf0417515aa4bc32d8 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -17,9 +17,9 @@ group("shell") {
testonly = true
deps = [
+ ":copy_symbols",
":mojo_shell",
":tests",
- ":copy_symbols",
]
if (is_android) {
@@ -200,8 +200,8 @@ source_set("parent_lib") {
deps = [
":child_controller_bindings",
"//base",
- "//base/third_party/dynamic_annotations",
"//base:base_static",
+ "//base/third_party/dynamic_annotations",
"//mojo/application",
"//mojo/common",
"//mojo/common:tracing_impl",
@@ -210,6 +210,9 @@ source_set("parent_lib") {
"//mojo/edk/system",
"//mojo/public/cpp/bindings",
"//mojo/public/interfaces/application",
+ "//mojo/services/media/audio/interfaces",
+ "//mojo/services/media/common/interfaces",
+ "//mojo/services/media/control/interfaces",
"//mojo/services/network/interfaces",
"//mojo/services/tracing/interfaces",
"//services/url_response_disk_cache",
@@ -416,9 +419,9 @@ if (is_android) {
"$root_out_dir/obj/shell/bootstrap_java.dex.jar",
]
deps = [
- ":mojo_shell_child",
":bootstrap",
":bootstrap_java",
+ ":mojo_shell_child",
"//mojo/public/tools:copy_network_service",
]
@@ -437,10 +440,10 @@ if (is_android) {
deps += [
"//services/authenticating_url_loader_interceptor",
- "//services/java_handler",
"//services/dart:dart_content_handler",
"//services/device_info",
"//services/icu_data",
+ "//services/java_handler",
"//services/kiosk_wm",
"//services/surfaces",
"//services/tracing",
@@ -589,8 +592,8 @@ test("mojo_shell_tests") {
deps = [
":parent_lib",
"//base",
- "//base/test:test_support",
"//base:i18n",
+ "//base/test:test_support",
"//mojo/common",
"//mojo/edk/system",
"//mojo/environment:chromium",
@@ -655,6 +658,7 @@ mojo_native_application("apptests") {
]
deps = [
+ ":embed_pingable",
"//base",
"//mojo/application",
"//mojo/application:test_support",
@@ -667,7 +671,6 @@ mojo_native_application("apptests") {
"//mojo/services/http_server/interfaces",
"//mojo/services/network/interfaces",
"//shell/test:bindings",
- ":embed_pingable",
]
data_deps = [
« no previous file with comments | « services/media/common/media_pipe_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698