| Index: mojo/public/tools/manifest/manifest_collator.py
|
| diff --git a/mojo/public/tools/manifest/manifest_collator.py b/mojo/public/tools/manifest/manifest_collator.py
|
| index fa95e37f21aa7d1c31c054a3925eca7f20bc5cbf..a2a3f2d0466a3a02cdf25f42de78cdbd1d3b9a86 100755
|
| --- a/mojo/public/tools/manifest/manifest_collator.py
|
| +++ b/mojo/public/tools/manifest/manifest_collator.py
|
| @@ -40,6 +40,14 @@ def MergeDicts(left, right):
|
| def MergeBaseManifest(parent, base):
|
| MergeDicts(parent["capabilities"], base["capabilities"])
|
|
|
| + if "applications" in base:
|
| + if "applications" not in parent:
|
| + parent["applications"] = []
|
| + parent["applications"].extend(base["applications"])
|
| +
|
| + if "process-group" in base:
|
| + parent["process-group"] = base["process-group"]
|
| +
|
|
|
| def main():
|
| parser = argparse.ArgumentParser(
|
|
|