diff options
| author | Adenilson Cavalcanti <adenilson.cavalcanti@arm.com> | 2020-06-03 09:32:10 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-03 09:32:10 +0000 |
| commit | f08c8ac9ec2b71f7409685e6885509f8f9d54340 (patch) | |
| tree | 26bffd2619cb99fddcfada043c5953f149b505ed /google | |
| parent | 3b9f806623453cfa3b3b723cb33ca8693d84fc73 (diff) | |
| download | zlib-f08c8ac9ec2b71f7409685e6885509f8f9d54340.tar.gz | |
Re-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: Id633b5aa287cd6b24c72af51a23c73d50617c68b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2227312
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Reviewed-by: Adenilson Cavalcanti <cavalcantii@chromium.org>
Reviewed-by: David Turner <digit@chromium.org>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#774555}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 3d10c9b5ebd65d5b6f9562c95542a0ff2eaec8c5
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 |