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

Unified Diff: mojo/public/mojo_application_manifest.gni

Issue 1828733004: Load application manifests from resources (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
Index: mojo/public/mojo_application_manifest.gni
diff --git a/mojo/public/mojo_application_manifest.gni b/mojo/public/mojo_application_manifest.gni
index 5b6cefe1d74d4758b7736ce6345fd0a2935084b5..cdcdf09833637cc0972277a86a308f8cf6d95437 100644
--- a/mojo/public/mojo_application_manifest.gni
+++ b/mojo/public/mojo_application_manifest.gni
@@ -10,12 +10,20 @@
# The manifest file template for this application, must be valid JSON with
# a valid 'url' key matching application_name.
#
+# base_manifest (optional)
+# A manifest file template to use as a base for |source|. Any properties
+# defined in |source| will overwrite or be merged with properties defined
+# in |base_manifest|.
+#
# application_name
# The host portion of the mojo: URL of the application. The script
# validates that the value of this parameter matches the host name portion
# of the 'url' property set in the manifest and throws a ValueError if
# they do not.
#
+# base_deps (optional)
+# Dependencies required to generate |base_manifest| if applicable.
+#
# deps (optional)
# An array of dependent instances of this template. This template enforces
# that dependencies can only be instances of this template.
@@ -84,6 +92,11 @@ template("mojo_application_manifest") {
"--output=$rebase_output",
]
+ if (defined(invoker.base_manifest)) {
+ rebase_base = rebase_path(invoker.base_manifest, root_build_dir)
+ args += [ "--base-manifest=$rebase_base" ]
+ }
+
if (defined(invoker.packaged_applications)) {
foreach(application_name, invoker.packaged_applications) {
input = "$root_out_dir/$application_name/manifest.json"
@@ -95,6 +108,9 @@ template("mojo_application_manifest") {
if (defined(invoker.deps)) {
deps += invoker.deps
}
+ if (defined(invoker.base_deps)) {
+ deps += invoker.base_deps
+ }
}
all_deps = []

Powered by Google App Engine
This is Rietveld 408576698