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

Unified Diff: mojo/public/mojo_application_manifest.gypi

Issue 1828733004: Load application manifests from resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/public/mojo_application_manifest.gni ('k') | mojo/public/tools/manifest/manifest_collator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/mojo_application_manifest.gypi
diff --git a/mojo/public/mojo_application_manifest.gypi b/mojo/public/mojo_application_manifest.gypi
index ddb202d29c274e26e0277780734b6200288afe65..bda86404707f917e00e39eab0852d10651b0a2b5 100644
--- a/mojo/public/mojo_application_manifest.gypi
+++ b/mojo/public/mojo_application_manifest.gypi
@@ -7,9 +7,11 @@
'variables': {
'application_name%': '<(application_name)',
'application_type%': '<(application_type)',
+ 'base_manifest%': 'none',
},
'application_type%': '<(application_type)',
'application_name%': '<(application_name)',
+ 'base_manifest%': '<(base_manifest)',
'manifest_collator_script%':
'<(DEPTH)/mojo/public/tools/manifest/manifest_collator.py',
'source_manifest%': '<(source_manifest)',
@@ -19,6 +21,11 @@
}, {
'output_manifest%': '<(PRODUCT_DIR)/<(application_name)_manifest.json',
}],
+ ['base_manifest!="none"', {
+ 'extra_args%': [ '--base-manifest=<(base_manifest)', ],
+ }, {
+ 'extra_args%': [],
+ }]
],
},
'actions': [{
@@ -36,6 +43,7 @@
'--application-name', '<(application_name)',
'--parent=<(source_manifest)',
'--output=<(output_manifest)',
+ '<@(extra_args)',
],
}],
}
« no previous file with comments | « mojo/public/mojo_application_manifest.gni ('k') | mojo/public/tools/manifest/manifest_collator.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698