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

Unified Diff: shell/BUILD.gn

Issue 1254963012: Fix generated file dependencies for upcoming gn (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 4 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/python/content_handler/BUILD.gn ('k') | third_party/cython/rules.gni » ('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 143ef6d8a0a7141c81561eecaf0e9bd310153773..6b34f62495bbc723e35ac54474715b245b93d343 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -332,6 +332,12 @@ if (is_android) {
"$root_out_dir/network_service.mojo",
"$root_out_dir/obj/shell/bootstrap_java.dex.jar",
]
+ deps = [
+ ":mojo_shell_child",
+ ":bootstrap",
+ ":bootstrap_java",
+ "//mojo/public/tools:copy_network_service",
+ ]
}
copy_ex("copy_mojo_shell_test_assets") {
@@ -341,6 +347,10 @@ if (is_android) {
"$root_out_dir/test_app.mojo",
"$root_out_dir/test_request_tracker_app.mojo",
]
+ deps = [
+ "//services/test_service:test_app",
+ "//services/test_service:test_request_tracker_app",
+ ]
}
if (!is_official_build) {
@@ -411,6 +421,7 @@ if (is_android) {
":copy_mojo_shell_assets",
":java",
":mojo_shell",
+ ":mojo_shell_manifest",
":resources",
"//base:base_java",
"//services/native_viewport:native_viewport_java",
@@ -496,14 +507,25 @@ test("mojo_shell_tests") {
}
}
+# Shared library propagation will happen up to executable, shared library,
+# or complete static library boundaries.
+# Workaround from brettw to prevent gn from linking pingable app into the
+# apptests executable.
+static_library("pingable_app_dummy") {
+ complete_static_lib = true
+ testonly = true
+ public_deps = [
+ "//shell/test:pingable_app($default_toolchain)",
+ ]
+}
+
embed_file("embed_pingable") {
source = "$root_build_dir/pingable_app.mojo"
namespace = "shell::test"
variable = "kPingable"
testonly = true
-
deps = [
- "//shell/test:pingable_app",
+ ":pingable_app_dummy",
]
}
@@ -561,6 +583,7 @@ copy("copy_symbols") {
deps = [
":mojo_shell",
+ ":mojo_shell_child",
]
if (is_android) {
deps += [ ":bootstrap" ]
« no previous file with comments | « services/python/content_handler/BUILD.gn ('k') | third_party/cython/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698