| commit | db18ea35620e772c9ab2593fb7f08f433c7275c0 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <[email protected]> | Tue Jun 11 21:12:39 2019 +0000 |
| committer | Commit Bot <[email protected]> | Tue Jun 11 21:12:39 2019 +0000 |
| tree | 53b371f3508bfcdcf2e4bce4134848be0dc0b101 | |
| parent | bbacb136705b7c5aadafd4807ff748388fb6a44e [diff] |
Simplify sharing third_party/zlib with AOSP Bug: https://issuetracker.google.com/115695768 Android would like to use Chromium's copy of zlib, to take advantage of its SIMD optimizations etc. However, it does not want the renames from chromeconf.h. Only include that file when building CHROMIUM/CHROME, so that Android's repo can have minimal differences from this one and build properly. See https://android-review.googlesource.com/c/platform/external/zlib/+/979128 Change-Id: I44985166edb16ccc3333f008e0840cdd8dbce055 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1648737 Reviewed-by: Chris Blume <[email protected]> Reviewed-by: Adenilson Cavalcanti <[email protected]> Commit-Queue: Adenilson Cavalcanti <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#668140} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 6f0e62538327e85d29118df5f546166a33c68001