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

Unified Diff: mojo/public/mojo_application.gni

Issue 1773343002: Adds views_mus_unittests to the linux bot (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: app resources to data_deps Created 4 years, 9 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 | « components/mus/BUILD.gn ('k') | testing/buildbot/chromium.linux.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/mojo_application.gni
diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni
index e71dd29b277238673ddc375d553debd7b9b83113..7ceb2d53f35cf73f77004bbeb5fe2788514d41f6 100644
--- a/mojo/public/mojo_application.gni
+++ b/mojo/public/mojo_application.gni
@@ -25,6 +25,8 @@ template("mojo_native_application") {
mojo_deps += invoker.deps
}
+ mojo_data_deps = []
+
if (defined(invoker.resources)) {
copy_step_name = "${base_target_name}__copy_resources"
copy(copy_step_name) {
@@ -37,7 +39,7 @@ template("mojo_native_application") {
}
deps = mojo_deps
}
- mojo_deps += [ ":$copy_step_name" ]
+ mojo_data_deps += [ ":$copy_step_name" ]
}
output = base_target_name + ".mojo"
@@ -85,6 +87,7 @@ template("mojo_native_application") {
if (defined(invoker.data_deps)) {
data_deps += invoker.data_deps
}
+ data_deps += mojo_data_deps
deps = [
"//mojo/platform_handle:for_shared_library",
@@ -183,7 +186,7 @@ if (is_android) {
base_target_name = invoker.output_name
}
- mojo_deps = []
+ mojo_data_deps = []
if (defined(invoker.resources)) {
copy_step_name = "${base_target_name}__copy_resources"
copy(copy_step_name) {
@@ -198,7 +201,7 @@ if (is_android) {
deps = invoker.deps
}
}
- mojo_deps += [ ":$copy_step_name" ]
+ mojo_data_deps += [ ":$copy_step_name" ]
}
zip_action_name = "${target_name}_zip"
@@ -242,7 +245,7 @@ if (is_android) {
"--line=#!mojo mojo:android_handler",
]
- deps = mojo_deps
+ data_deps = mojo_data_deps
public_deps = [
":$zip_action_name",
« no previous file with comments | « components/mus/BUILD.gn ('k') | testing/buildbot/chromium.linux.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698