| commit | 9a386b80f85f9766b169327c8377ae86fe6bcd87 | [log] [tgz] |
|---|---|---|
| author | Gary Bressler <geb@fuchsia.infra.roller.google.com> | Tue May 09 20:40:32 2023 +0000 |
| committer | Copybara-Service <copybara-worker@google.com> | Tue May 09 13:41:30 2023 -0700 |
| tree | df12c59de4071fbbdf768b7256b7adeea6d2ac4e | |
| parent | 36d1583023943306ea9b3a4441f4ecd0f2f12e5d [diff] |
[roll] Roll fuchsia [cmc] Merge doesn't flatten declarations Today, when multiple cml files are merged with `cmc merge` or `include`, all array declarations in the merged are flattened. This is accomplished by the `flatten_docs!` macro in libcml which flattens OneOrMany(Many) into Vec<OneOrMany<One>>. This means that the output of a merged cml will look different and more verbose than the original cml. It's also confusing from an implementation perspective, since the data structures representing the cml will always carry OneOrMany(One) even though notionally they can have Many and the compiler is written with that assumption. What's more, the original code didn't flatten everything it could (missed directories in offer/expose, etc.) This change replaces the `flatten_docs!` macro with a custom merge algorithm for OneOrMany. Tested: Patched fxrev.dev/847341, and ran a script to validate all generated cmls are identical up to grouping and order Original-Bug: 98368 Original-Fixed: 124675 Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/847341 Original-Revision: fde2e471e0ee746fc10d136596eed2dc18edf8d1 GitOrigin-RevId: 82a7525ee041a8df521883d2d15e806cc40f3706 Change-Id: I1dd34553ec2cc372050f8bd4ad3a0de01d1366c4
This repository contains Fuchsia's Global Integration manifest files.
All changes should be made to the internal version of this repository. Our infrastructure automatically updates this version when the internal one changes.
Currently all changes must be made by a Google employee. Non-Google employees wishing to make a change can ask for assistance via the IRC channel #fuchsia on Freenode.
First install Jiri.
Next run:
$ jiri init $ jiri import minimal https://fuchsia.googlesource.com/integration $ jiri update
Third party projects should have their own subdirectory in ./third_party.