| Index: mojo/public/mojo_application_manifest.gni
|
| diff --git a/mojo/public/mojo_application_manifest.gni b/mojo/public/mojo_application_manifest.gni
|
| index 589e30e6050eef8e0001dd417d92ce41645664d6..b66626b88bfa0b6f5d0d550e4cccafa4c529ce5f 100644
|
| --- a/mojo/public/mojo_application_manifest.gni
|
| +++ b/mojo/public/mojo_application_manifest.gni
|
| @@ -12,12 +12,20 @@ import("//mojo/public/mojo_constants.gni")
|
| # 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.
|
| @@ -86,6 +94,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/$mojo_application_subdir/$application_name/manifest.json"
|
| @@ -97,6 +110,9 @@ template("mojo_application_manifest") {
|
| if (defined(invoker.deps)) {
|
| deps += invoker.deps
|
| }
|
| + if (defined(invoker.base_deps)) {
|
| + deps += invoker.base_deps
|
| + }
|
| }
|
|
|
| all_deps = []
|
|
|