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

Unified Diff: mojo/public/mojo_application.gni

Issue 1850623004: Create .mojo applications in a common subdir under out/Debug (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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/resource_provider/file_utils.cc ('k') | mojo/public/mojo_application_manifest.gni » ('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 7ceb2d53f35cf73f77004bbeb5fe2788514d41f6..a18111196fcde76e4f8e6087326540ff4b12f88d 100644
--- a/mojo/public/mojo_application.gni
+++ b/mojo/public/mojo_application.gni
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/toolchain/toolchain.gni")
+import("//mojo/public/mojo_constants.gni")
if (is_android) {
import("//build/config/android/rules.gni")
@@ -32,7 +33,7 @@ template("mojo_native_application") {
copy(copy_step_name) {
sources = invoker.resources
outputs = [
- "${root_out_dir}/${base_target_name}/resources/{{source_file_part}}",
+ "${root_out_dir}/${mojo_application_subdir}/${base_target_name}/resources/{{source_file_part}}",
]
if (defined(invoker.testonly)) {
testonly = invoker.testonly
@@ -141,7 +142,7 @@ template("mojo_native_application") {
"${root_shlib_dir}/${library_name}",
]
outputs = [
- "${root_out_dir}/${base_target_name}/${output}",
+ "${root_out_dir}/${mojo_application_subdir}/${base_target_name}/${output}",
]
}
@@ -192,7 +193,7 @@ if (is_android) {
copy(copy_step_name) {
sources = invoker.resources
outputs = [
- "${root_out_dir}/${base_target_name}/resources/{{source_file_part}}",
+ "${root_out_dir}/${mojo_application_subdir}/${base_target_name}/resources/{{source_file_part}}",
]
if (defined(invoker.testonly)) {
testonly = invoker.testonly
@@ -222,8 +223,7 @@ if (is_android) {
])
}
- _mojo_output =
- "${root_out_dir}/${base_target_name}/${base_target_name}.mojo"
+ _mojo_output = "${root_out_dir}/${mojo_application_subdir}/${base_target_name}/${base_target_name}.mojo"
action(target_name) {
script = "//mojo/public/tools/prepend.py"
« no previous file with comments | « components/resource_provider/file_utils.cc ('k') | mojo/public/mojo_application_manifest.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698