[roll] Roll fuchsia [idk] Deduplicate variants.

The merger script previously didn't deduplicate when two IDKs each
specified the same variant.

In practice, different subbuilds shouldn't specify the same variant.
However, in order to tar up the IDK, we actually merge it with _itself_.
I'm going to fix that in the next CL, but out of an abundance of
caution, I want to make sure that just deduplicating the variants
doesn't cause any issues.

Original-Bug: 313682083
Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/987875
Original-Revision: 640b3781d3d1e4038383f2ce1d81ee4bbb420acd
GitOrigin-RevId: 35fc3b65d395669c910534ed6daef806e58d427d
Change-Id: Id63f018f41a22da458956823bf80094487834941
1 file changed
tree: 509e868198905538d5c6e31be411b59ad18607fb
  1. git-hooks/
  2. infra/
  3. third_party/
  4. cts
  5. firmware
  6. flower
  7. jiri.lock
  8. MILESTONE
  9. minimal
  10. prebuilts
  11. README.md
  12. stem
  13. test_durations
  14. toolchain
README.md

Integration

This repository contains Fuchsia's Global Integration manifest files.

Making changes

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.

Obtaining the source

First install Jiri.

Next run:

$ jiri init
$ jiri import minimal https://fuchsia.googlesource.com/integration
$ jiri update

Third party

Third party projects should have their own subdirectory in ./third_party.