GitLab

This reverts commit 812edd08.

Reason for revert: libuuid1:i386 should now be installed on the bots (bug 853048)

Original change's description:
> Revert "Reland "Update fontconfig to 6cc99d6a""
> 
> This reverts commit 0c91664f.
> 
> Reason for revert: Broke Linux Builder (dbg)(32)
> 
> Still missing libuuid:
> 
> https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Linux%20Builder%20%28dbg%29%2832%29/83697
> 
> [775/4337] ACTION //tools/v8_context_snapshot:generate_v8_context_snapshot(//build/toolchain/linux:clang_x86)
> FAILED: v8_context_snapshot.bin 
> python ../../build/gn_run_binary.py ./v8_context_snapshot_generator --output_file=v8_context_snapshot.bin
> ././v8_context_snapshot_generator: error while loading shared libraries: libuuid.so.1: cannot open shared object file: No such file or directory
> ./v8_context_snapshot_generator failed with exit code 127
> 
> Original change's description:
> > Reland "Update fontconfig to 6cc99d6a"
> > 
> > This is a reland of e6db40d9
> > 
> > Reason for reland: All bots should now have libuuid1 installed (bug 853048).
> > 
> > Original change's description:
> > > Update fontconfig to 6cc99d6a
> > >
> > > Changelog [1].  This is necessary to pick up [2] for fixing undefined-shift
> > > UBSAN errors detected by clusterfuzz, [3] to allow removing a build workaround,
> > > [4] to fix a bug and clean up some log spam, [5] to fix CFI builds, and [6] to
> > > fix a use-after-free.
> > >
> > > Fontconfig also now requires libuuid as a dependency, so whitelist it as a
> > > dependency since we statically link fontconfig.
> > >
> > > [1] https://chromium.googlesource.com/external/fontconfig/+log/b546940435ebfb0df575bc7a2350d1e913919c34..6cc99d6a82ad67d2f5eac887b28bca13c0dfddde
> > > [2] https://chromium.googlesource.com/external/fontconfig/+/c60ed9ef66e59584f8b54323018e9e6c69925c7e
> > > [3] https://chromium.googlesource.com/external/fontconfig/+/b8a225b3c3495942480377b7b3404710c70be914
> > > [4] https://chromium.googlesource.com/external/fontconfig/+/7ad010e80bdf8e41303e322882ece908f5e04c74
> > > [5] https://chromium.googlesource.com/external/fontconfig/+/096e8019be595c2224aaabf98da630ee917ee51c
> > > [6] https://chromium.googlesource.com/external/fontconfig/+/6cc99d6a82ad67d2f5eac887b28bca13c0dfddde
> > >
> > > BUG=831146,822737,787020,829890,847323
> > > TBR=thestig,dnicoara
> > >
> > > Change-Id: Ic2d1bd19af8ca131c960a30d09246827c115ccec
> > > Reviewed-on: https://chromium-review.googlesource.com/1095538
> > > Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> > > Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> > > Reviewed-by: Lei Zhang <thestig@chromium.org>
> > > Reviewed-by: Daniel Nicoara <dnicoara@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#567445}
> > 
> > TBR=thestig,dnicoara
> > 
> > Bug: 831146, 822737, 787020, 829890, 847323, 853048
> > Change-Id: Id42738aaf5841bd219dc0e9209680c87e88f4869
> > Reviewed-on: https://chromium-review.googlesource.com/1104759
> > Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#568221}
> 
> TBR=thestig@chromium.org,robliao@chromium.org,dnicoara@chromium.org,thomasanderson@chromium.org
> 
> Change-Id: Icd39638df79083776546d4283675c3e172bbefe4
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 831146, 822737, 787020, 829890, 847323, 853048
> Reviewed-on: https://chromium-review.googlesource.com/1105539
> Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
> Commit-Queue: Giovanni Ortuño Urquidi <ortuno@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#568346}

TBR=thestig@chromium.org,robliao@chromium.org,dnicoara@chromium.org,ortuno@chromium.org,thomasanderson@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 831146, 822737, 787020, 829890, 847323, 853048
Change-Id: I5fe29b3ff4ba7ec81498878124a39c70d5e9a8be
Reviewed-on: https://chromium-review.googlesource.com/1112179Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Elliott Friedman <friedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569800}