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

Unified Diff: mojo/mojo_application_package.gni

Issue 1108403008: Adds resource_provider::ResourceProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 8 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 | « mojo/BUILD.gn ('k') | mojo/services/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_application_package.gni
diff --git a/mojo/mojo_application_package.gni b/mojo/mojo_application_package.gni
index 9e6c1fddbe481686be2541a89ef510da9854b33f..233ee97c6d96ffd44b9dce01626efe20e2a9576f 100644
--- a/mojo/mojo_application_package.gni
+++ b/mojo/mojo_application_package.gni
@@ -9,18 +9,17 @@ import("//third_party/mojo/src/mojo/public/mojo_application.gni")
# output_name.mojo : the shared library
# resources : resources
template("mojo_application_package") {
- if (defined(invoker.output_name)) {
- output_name = invoker.output_name
- } else {
- output_name = target_name
- }
-
mojo_deps = []
if (defined(invoker.deps)) {
mojo_deps += invoker.deps
}
if (defined(invoker.resources)) {
+ output_name = target_name
+ if (defined(invoker.output_name)) {
+ output_name = invoker.output_name
+ }
+
copy("copy_mojo_application_resources") {
sources = invoker.resources
outputs = [
@@ -30,8 +29,12 @@ template("mojo_application_package") {
mojo_deps += [ ":copy_mojo_application_resources" ]
}
- mojo_native_application(output_name) {
- output_name = invoker.target_name + "/" + invoker.target_name
+ mojo_native_application(target_name) {
+ output_name = invoker.target_name
+ if (defined(invoker.output_name)) {
+ output_name = invoker.output_name
+ }
+ output_name = output_name + "/" + output_name
deps = mojo_deps
« no previous file with comments | « mojo/BUILD.gn ('k') | mojo/services/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698