diff options
| author | Adenilson Cavalcanti <adenilson.cavalcanti@arm.com> | 2020-06-02 20:55:38 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-02 20:55:38 +0000 |
| commit | aa9ab849c1280bbc3edb2b421d07cce1b2657980 (patch) | |
| tree | 26bffd2619cb99fddcfada043c5953f149b505ed /google | |
| parent | 228a473cb7009dfa286c00efbe7ff686926ecf10 (diff) | |
| download | zlib-aa9ab849c1280bbc3edb2b421d07cce1b2657980.tar.gz | |
Re-land migrate md5sum tool to portable zlib utils
Use the set of portable code from zlib that shouldn't have
extra dependencies (e.g. 'base').
Also allow building the tool for other targets (e.g. Linux,
OSX, etc) as that allows easier testing and profiling.
Compilation is disabled for Windows, see crbug.com/1090428.
Bug: 1076580, 1087999
Change-Id: Ic036685029be99b06753ea18f9fc62ce7c1a6540
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2225526
Reviewed-by: Tao Bai <michaelbai@chromium.org>
Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Adenilson Cavalcanti <cavalcantii@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#774325}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 00c7f91f09462399fff5e5266eeddcd6e0c9405c
Diffstat (limited to 'google')
| -rw-r--r-- | google/BUILD.gn | 10 | ||||
| -rw-r--r-- | google/compression_utils_portable.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/google/BUILD.gn b/google/BUILD.gn index a628d2f..b7d3d6b 100644 --- a/google/BUILD.gn +++ b/google/BUILD.gn @@ -35,6 +35,15 @@ if (build_with_chromium) { } } +# It seems that Fuchsia bot will fail to build if we don't explicitly +# add this config as part of utils_portable. +config("zlib_portable_utils_config") { + include_dirs = [ + "//third_party/zlib", + "//third_party/zlib/google", + ] +} + # This allows other users of Chromium's zlib library, but don't use Chromium's # //base, to reuse some boilerplate code. static_library("compression_utils_portable") { @@ -43,4 +52,5 @@ static_library("compression_utils_portable") { "compression_utils_portable.h", ] deps = [ "//third_party/zlib" ] + public_configs = [ ":zlib_portable_utils_config" ] } diff --git a/google/compression_utils_portable.h b/google/compression_utils_portable.h index c467bf7..c1f3775 100644 --- a/google/compression_utils_portable.h +++ b/google/compression_utils_portable.h @@ -14,6 +14,7 @@ */ #if defined(USE_SYSTEM_ZLIB) #include <zlib.h> +/* AOSP build requires relative paths. */ #else #include "zlib.h" #endif |