-
Aaron Gable authored
This reverts commit c00c874f83f6787de5a1b946ffcea9f49637c139. Reason for revert: Caused compile failures on non-RBE Goma See o/51853436 for context. See https://ci.chromium.org/p/chromium/builders/ci/ios-simulator-cronet/103497 for sample failure. Original change's description: > clang build.py: change LLVM_ENABLE_ZLIB from ON to FORCE_ON > > This uses the FORCE_ON option to enable zlib to ensure that clang > actually finds and uses zlib. Also moved this setting out of > base_cmake_args so that it is only used in the main clang build, > since there is another 32-bit build that can't use this zlib. > > Also changed to remove and re-download the zlib source on > every build. > > Change-Id: Ifceabc2ba06e4e4a56464f18de80610a0f043641 > Bug: 1061189 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2118674 > Commit-Queue: Amy Huang <akhuang@google.com> > Reviewed-by: Nico Weber <thakis@chromium.org> > Cr-Commit-Position: refs/heads/master@{#753301} TBR=thakis@chromium.org,hans@chromium.org,rnk@chromium.org,akhuang@google.com Change-Id: I9dad136109c540c0c700d67632573639b2596e5c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1061189 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2121078 Reviewed-by: Aaron Gable <agable@chromium.org> Commit-Queue: Aaron Gable <agable@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#753326} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 640977954c3500b17c6cbf67cb48f10e9859d3e3
ba8f35dc